Merge "Remove unused target android.test.mock.sdk" am: a4c0fa769a am: 9d78e84a8e
am: 39e11f5255  -s ours

Change-Id: I971ace608193c07a107aa5c454dc164b13a47070