Merge "Further document MapInfo::elf_offset." am: 07001d909f
am: 0d3d0cd8a7

Change-Id: I9663e95d160c8a191ff8a1f2efa7c43959f83b3a