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

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

Change-Id: I3f1223be005606ca3fd067969fd3049423580af6