am 17e2f436: Merge "Lose cmp to toybox."

* commit '17e2f436f0da70673498482921a642c8917677aa':
  Lose cmp to toybox.