Merge changes I26e290c0,I1b006d2a

* changes:
  Add oom score tracking to procrank
  C++-ify procrank