Merge "Merge "Added android.test.mock and android.test.mock.sdk targets" am: 46f8d427 am: de30ee2d am: e4687471 am: 2fa69bdf -s ours"