Merge "Revert Android.bp changes."