Merge "Fix adb/fastboot windows compilations."