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

* commit '0ddd9b21434f65d32fb8fb51423b181e31d180fd':
  Fix Win32 adb build.