Merge "Add Android.bp prebuilt ELF check error fixer" am: f60ad911d4 am: 7d6785b6d8 am: 218b0c3135 am: db8dc337c8

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

Change-Id: If7ef837bd077c17cbc3d44c5b91303f84626859e