Merge change 21041 into donut

* changes:
  BUG 2040986 : SDK Updater, platform dependency on tools