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

Change-Id: I9c4068fcccedeaf00e2c3d52b8e8f75a2ef033f5