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

Change-Id: I20a9d5a5c2dbeaf778808e82f4a992d9446e60b3