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

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