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

Change-Id: I8d8baba1bb2106b1ac6f9a367e42041bc52f60d0