Merge "libprocinfo: provide MapInfo structure for reading maps." am: cc684eb085
am: 9091ab6fc4

Change-Id: I918db55a2753bc3eed33c0f3a53fcdff12d4033e