am 80cd32ae: am 63feeaaa: Merge "Fix Windows adb build."

* commit '80cd32ae640902e548ea0a7ed738b04b4a97fce5':
  Fix Windows adb build.