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

Change-Id: I6ba7723e25704ea45f49f80372a3d862b837c4b2