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

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

Change-Id: I566625f3ee0b9e257b6c5d0524016a5d0028bd5e