Merge "android.test.mock is built with much less number of sources" am: f0b9dfc0b1 am: a321a944ea
am: dcfd8ddce7

Change-Id: I67d7d2e9e490fd71c472e38e105c8fcfcb17df60