Merge "Remove make-based disting of android stubs" into rvc-dev-plus-aosp am: d3df39827d am: 95e6ecb90b am: 1075dce1cc

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12204115

Change-Id: Ic2c9564b74380e08eb416c0076ec79fffb2c10b7