Merge "Verify that the elf matches the expected arch."
am: b31badf70f

Change-Id: Id0d0a3256f88f4451555b157fb88b9a4416288ca
Cr-Mirrored-From: https://chromium.googlesource.com/aosp/platform/system/core
Cr-Mirrored-Commit: bc2a0e3049129b05df867ba2e61570d9f64c33e9
3 files changed