Merge "Make android.test.mock.stubs in Android.bp"