[automerger skipped] Merge "Update Android.bp for api-stubs in order to do api-check." am: 001d2aed31 am: da5d25cac5  -s ours
am: 10e86d9f2f  -s ours

Change-Id: Ie40cfd3e5f02bda389023efca11f61b3f44bec3d