Merge "Remove make-based disting of android stubs" am: 028eea49f8

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

Change-Id: I2d7362ea44afff390f07147655f4a28277ba15a0