Merge "Added android.test.mock and android.test.mock.sdk targets" am: 46f8d427c4 am: de30ee2d40 am: e468747115
am: 2fa69bdfce  -s ours

Change-Id: I2559922e3e55d0b64dea38646836fe3ab8ee7fd0