Merge "Fix some bugs in dumpsys meminfo attribution" into qt-dev am: 652b445c07
am: 63b02d86ae

Change-Id: Ia5e73ba231298978f84ba1d9e974c144565db336