This patch fixes an incompatibility where some tests in the same
hierarchy were using Junit3, and other Junit4
No functional test changes made
Bug: 72950854
Test: Ran on devices, working
Change-Id: I79d231e202ba25ad5f57b44b387bebd7f012aa95
Merged-In: I79d231e202ba25ad5f57b44b387bebd7f012aa95
(cherry picked from commit 0d08e91fe7)