Refactor code incompatible with Mockito 2.7.13

Bug: 32912773
Test: make checkbuild
Merged-In: I64064617ced76f0cbd288f9c1d0e4e98e0101d77
Change-Id: I11d00bc4b4dfd2793e38cff0bb7067e2b6247ac7
1 file changed
tree: 7805a617f0a7f2436594fb3391d2c997fec202a8
  1. Android.mk
  2. AndroidManifest.xml
  3. CleanSpec.mk
  4. res/
  5. src/
  6. tests/