Merge "Remove unused target android.test.mock.sdk"