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

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

Change-Id: I5a0339b7cde23e69b63c82a8ad7d57ee46036a0a