Merge "Update Android.bp for api-stubs in order to do api-check."
am: 001d2aed31

Change-Id: Ic7500b86c150b2c5f5870374a6ab5b0215278814