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

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

Change-Id: I2923903174fdae434c419595a908d6d88bda4a48