Merge "Use /proc/pid/smaps_rollup when available" into oc-mr1-dev
am: ea7a45eb43

Change-Id: I95f60dc9be2a837de985bc26dd67d20b8efe70d8