am 1d0c3fb7: am cc825ae7: Merge "Lose cp to toybox."

* commit '1d0c3fb751ce971ad00136781864d010773e86d2':
  Lose cp to toybox.