Merge changes from topic "mockito-dexmaker-update-revert"

* changes:
  Reland "New API to clean up all inline mocks after test"
  Revert "Update to Mockito v2.25.7."
  Revert "Add a host test for Mockito."