am 3e16e2d6: Merge "Fix adb/fastboot windows compilations."

* commit '3e16e2d6195e112a2bfe2f958e1cfec2bd109a1c':
  Fix adb/fastboot windows compilations.