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

Change-Id: Ibc453f8017ca35c69c1274b16e26a561caba8655