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

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

Change-Id: I3d8d543a0947c5606cd4f1e4445f6a34f8248b7f