Merge "Lose ps to toybox."
am: 31701d6074

* commit '31701d6074effb399cf717da21abde91d7e29dd7':
  Lose ps to toybox.

Change-Id: I5b24a54c4e9a7e64853c71d13256aa6cf89ca0ac