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

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

Change-Id: Ia3f3de0f0edca000814a7afc39e7b49b6efbf95f