Refactor code incompatible with Mockito 2.7.13
am: ac9020cb29

Change-Id: Id47a90545eb2a3e0c9cb86aecb62009ea1661988
tree: 66f2c614d792f07f0ebec3445b21cd9cab79972f
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. CleanSpec.mk