Merge "Adjust and update dumpsys meminfo output." am: 165050810b am: c2f5e33525
am: 9409ec02a6

Change-Id: I506c914212ee2e2d366c2469a7aecf3d9528b78a