am 34c91edd: Merge "Fix the Windows adb build."

* commit '34c91eddb09ab86ffe6c965b25c5253c37ded227':
  Fix the Windows adb build.