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

Change-Id: Ide52b02276d39e9c74baf0ab82fc47f144910455