Merge changes from topic 'mockito-without-junit'

* changes:
  Use mockito-target-minus-junit4.
  android.core.tests.libcore.package.tests: add mockito to the dependencies