Merge "Make literal arguments passed to art::MemMap::DumpMaps' more explicit."
am: d04fc96d22

Change-Id: Ie18b4f4a365f91c3124f0a80589e5bae87e46d1d