am cc825ae7: Merge "Lose cp to toybox."

* commit 'cc825ae79219f2b5d9fa768d50963ad2f43bbd11':
  Lose cp to toybox.