Merge "Added android.test.mock and android.test.mock.sdk targets"
am: 46f8d427c4

Change-Id: I93ecb5e95337b84c2746b802fa88382cdd676cb8