Merge "Fix crash in check_elf_file.py" am: ecf75cd3 am: c7c2dde5 am: 4a2cc299

Original change: https://android-review.googlesource.com/c/platform/build/+/2296277



Change-Id: I58aaac51d8d9a42b2cd813c2c59089fd5f0f4a97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>