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

Change-Id: I75919b372db6f62ea474c51f11bd544c5bc78c5f