Merge "Merge "Update Android.bp for api-stubs in order to do api-check." am: 001d2aed" into stage-aosp-master