am 2e942a47: Merge "Fix Win32 adb build."

* commit '2e942a47967ad302db15b3f7f17cf17f28785d16':
  Fix Win32 adb build.