Merge "Revert drop of Android.bp" into sc-dev