Merge "Add Android.bp prebuilt ELF check error fixer"