Merge "android.core.tests.libcore.package.tests: add mockito to the dependencies" into nyc-dev