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

* commit 'f5a6c6bbb5e83824161356106876baeb80d8a986':
  Lose cmp to toybox.