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

Change-Id: I6db802857405e61b96c9f1863f96584d43bcbc9a