Merge "Fix stack memory accounting for dumpsys" into qt-dev
am: cfc26842d3

Change-Id: I13b9eef178e307fbac63d68dabd82240037627bc