[automerger skipped] Merge "Update Android.bp for api-stubs in order to do...
[automerger skipped] Merge "Update Android.bp for api-stubs in order to do api-check." am: 001d2aed
am: da5d25ca -s ours
Change-Id: Ic67fee194b491d4fa1868e9022dcee4c1086967f