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

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