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

Change-Id: I615e245f2f0f50f2afe8726ada55a81101fce6bb