Merge "Fix dumpsys meminfo -c output." into nyc-dev
am: c61e102474

* commit 'c61e102474c1fe0e16503856531106f8bff9e36b':
  Fix dumpsys meminfo -c output.