am 6281dbcd: am 7d86f5e5: am 239f6ac8: Merge "Fix Win32 adb build (for the second time today)."

* commit '6281dbcd11d3e43e865152c426601d1097d26149':
  Fix Win32 adb build (for the second time today).