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

Change-Id: Ic28dfe414d4d7b75f9f2615d892b2f1463c96aaa