Merge "Remove the prebuilt tools cleanstep logic." am: cff032ca54
am: 13a225ff9f

* commit '13a225ff9fa382ac543eba30fe70c08c4a69eeeb':
  Remove the prebuilt tools cleanstep logic.