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

Change-Id: I893621c8ab183bb0d583f7b5c82d9ddcbb9b9162