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

* commit '3094c26d1b4c222d6a056e913619f88fa597c5d2':
  Fix adb/fastboot windows compilations.