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

* commit '63feeaaa0608e63969f434456ddaa32bf85bd220':
  Fix Windows adb build.