[automerger skipped] Merge "Read memory stats from /proc/pid/stat file." am: d936e628a3  -s ours am: e10165769e
am: ecc05e6e54  -s ours

Change-Id: Ie3f81c1fa27a92175ec6f8744e26003f90aa335e