Re-apply "Remove make-based disting of android stubs" am: 1bb1ac1759

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

Change-Id: I001bf5a8c44f98e40f0943917c6dcaeb5fab4b2b