am 25279c75: Merge change 21041 into donut

Merge commit '25279c75fa6a0ef286b1cbf13c44cc140345a851' into eclair

* commit '25279c75fa6a0ef286b1cbf13c44cc140345a851':
  BUG 2040986 : SDK Updater, platform dependency on tools