Merge changes from topic "update-mockito-dexmaker" am: b82d78572d am: 05e52b4c99
am: 75b5e3ad98

Change-Id: Iebd93e5a25f38e2633a0d2a6733423fc2e9fa4dd