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

Change-Id: I639bbb69c2b563505f6546b14a55fbaf328dcf8c