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

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

Change-Id: Ic9257b6edf3557319283b579bfde59678b743410