Merge "Fix bug in reporting SwapPss in dumpsys meminfo."