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

Change-Id: I196cc30e5b9512712428d8e9524441070395a189