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

Change-Id: I7c69c87d4d0e203b37af4bd411f1663c71ba886d