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

* commit 'cff032ca54f4dfc06f88b863d09c66040151bc36':
  Remove the prebuilt tools cleanstep logic.