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

Change-Id: Ie62a0bd4f1fb50a2a02a0129a5006485a51ae734