Merge "Update Android.bp for api-stubs in order to do api-check." into pi-dev-plus-aosp