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

Change-Id: Ife6a6ffc348f3c0253b843fbd3833727ef0c3e22