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

Change-Id: I672175bd07796012d7c62cc80ea01185ce014827