Merge changes Iea2a3055,I6582cfc6

* changes:
  adb: start building windows test again.
  adb: fix windows test build.