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

* commit '747fdac426ea6dda789684af12b11392051366be':

Change-Id: I333cfb300bf13d0108c594b852045f297fed9c43