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

Change-Id: I5f4905341fa81361c1e0feb8a65944d93f840907