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

Change-Id: Id0d0a3256f88f4451555b157fb88b9a4416288ca