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

Change-Id: I5f8ac544302ecc1fe9972bcb7237586b8adcc70a