Android n mr1 preview 2
Merge changes from topic 'upgrade-mockito-1.10.19-dexmaker-1.3'
am: e34cba15c1

Change-Id: I83144638c2fe3faabccf41972a9b42da12478458