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

Change-Id: I26dd2413b054c9dae00cc0f4f53e5a99bf81740a