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