[automerger skipped] Merge "Merge "Update Android.bp for api-stubs in order to do api-check." am: 001d2aed31" into stage-aosp-master
am: 501f20bc63  -s ours

Change-Id: I485171dcd37c6a1977e1dce15ccc0837c261a517