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

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

Change-Id: I1a4a5b5bfd931eb30e89c9e24b9df19596eb1164