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

Change-Id: I0880b668854ce15da53e7736afac4fcd0343139c