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

Change-Id: Ie20f03c260883345171871196284f4dc2b6d06cd