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

Change-Id: Ic6d7b3f6d406b14c5649b7efabae72542fb2ece7