[automerger skipped] Merge "Remove make-based disting of android stubs" am: 028eea49f8 am: 4f8d10c1d9 -s ours

am skip reason: Change-Id I1af2aac1a354f66ecb9dfa7f2a44af16cdfa647d with SHA-1 71573ce358 is in history

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

Change-Id: I63099d1c901d80e0d73c015ceefab71814b5bbdb