am adc8dc32: am c27c4ead: Merge "Prepare CTS for the future where toybox has fully replaced toolbox."

* commit 'adc8dc322b4e8d22ea27342ca83385f09dd9b6e4':
  Prepare CTS for the future where toybox has fully replaced toolbox.