am 59d3779d: am 924869d4: am 34c91edd: Merge "Fix the Windows adb build."

* commit '59d3779d2ba96f8806e667461d8aece0b858c6cc':
  Fix the Windows adb build.