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

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

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