Merge "add swapPss of native process to totalSwapPss" am: 0db84fcc8f
am: c3af6331e5

Change-Id: I4e8dbdd04ae92d1b6882ac476e8b4990a34bbb27