Merge "Further document MapInfo::elf_offset." am: 07001d909f am: 0d3d0cd8a7 am: 2810d0f2c9
am: 42874b667e

Change-Id: I11ac7755aeac675ac358e80d6e7fa7015f615fd2