[automerger skipped] Merge "Merge "Update Android.bp for api-stubs in order to...
[automerger skipped] Merge "Merge "Update Android.bp for api-stubs in order to do api-check." am: 001d2aed" into stage-aosp-master am: 501f20bc -s ours
am: 0df7b9ea -s ours
Change-Id: Icdbcc89468f88e613e126815e28db517199d079a