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

Change-Id: I5f60087f690430e2bbd935498c12b0245c522321