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

* commit '51d08e8e7abe50051650b1ea5936006c6d6da3e9':
  Fix Win32 adb build.