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

Change-Id: Ic4ed5159c6e823167bc867e29d15dc526a3c33ea