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

Original change: https://android-review.googlesource.com/c/platform/development/+/2373488

Change-Id: Ifee80edd8427b45c80ff662ac07ac382a46e6e6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>