am b13d4c59: Merge "Change MemMap::maps_ to not be global variable"

* commit 'b13d4c592c187c54d6870b1d46601f3c00783fc7':
  Change MemMap::maps_ to not be global variable