Merge change 21445 into donut

* changes:
  SDK Updater, restart ADB after updating tool/addon package.