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

Change-Id: Ib3eb58e7cbb296d14a9ee1d73e2022519b7e04d2