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