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