[automerger skipped] Merge "Read memory stats from /proc/pid/stat file." into pi-dev
am: e77572d76d  -s ours

Change-Id: I1a594da0c5eda810d641e33809fae5c695606d68