Merge "Move stubs to the bottom of Android.bp" into sc-mainline-prod