Merge "Always check ELF files for `check-elf-files`" am: 455d7e545a am: ef2a9d7002
am: 394e0957ed

Change-Id: I5999e17416d836826aeeb4851c87e16fbc65d1e7