Merge "Include the map name when dumping memory around a register." am: ffe12c600f am: 6737861501
am: ec31bbdd95

Change-Id: Iea1d76f8251d96c4e5180f407ff042bab7b99354