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

Change-Id: I5a0749769c74a760989808fce80835191f137231