Merge changes I26e290c0,I1b006d2a
am: d603e616b9

* commit 'd603e616b917c098bf6b050138e7b7ce6054c07e':
  Add oom score tracking to procrank
  C++-ify procrank

Change-Id: Icc3e2762f8c46b5742176582abc09f624182ff51