Merge "vts test for /proc/<pid>/smaps_rollup"
am: a0b17a3d8b

Change-Id: I04bccf644a70f229892e4a2e063c316a7b917515