Merge "Fix up the definition of Elf::GetInfo." am: 6853a187e3
am: 96139a5da1

Change-Id: I9d8694103e52b45a354010c73ac88d57e01c891c