Merge "Be permissive about badly formed elf files." am: c7815d675a
am: 5aa46568b3

Change-Id: Ibc31c09802bbae5cdb105e0e18d45854c0f652d1