Merge "Don\'t count vm_map_ram as used memory in vmallocinfo." into nyc-dev am: bf67e5d am: 747fdac
am: 9920e78

* commit '9920e78248965886a28c4dce0abf240bece78c29':

Change-Id: I3470b5f7b815729aa14046fbf0fd970dfef6a767