Revert "Remove make-based disting of android stubs" am: 37956f0aac am: 94bb40fa4f

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

Change-Id: I92518abe9ff66f4aa02cc0ea96674d0ae8e267dd