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

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

Change-Id: Ie7c883dfe8d175c4eb3e17ac63dc243c19541ed9