Merge "Remove unused target android.test.mock.sdk"
am: a4c0fa769a

Change-Id: I4ff49776db15ff17449ac615cefd3d2c5e3d2465