Merge "Revert "Provide a script to update the generated Android.bp""