Merge "Make android.test.mock.stubs in Android.bp"
am: 5f29cbb53b

Change-Id: I8859b904e6413a6bf1055fdb9f21e100d9e68d6a