Merge "Don't build android.test.mock.stubs for unbundled builds"