Merge "Prevent double-counting of kernel stack size in dumpsys reports"
am: 9493f0ed0b

Change-Id: If643779ba45321f1dcb5b772ade4de451fcd4e1a