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

* commit '924869d4eeb0926b991d1369f59b81419d251d52':
  Fix the Windows adb build.