Merge "bionic now has ElfXX_Chdr..." am: 0cb208dc6f
am: ce252a75e4

Change-Id: Ibb917945f2c4a3d8bdcfee1722bc2a92e47a9381