Merge "adb: actually fix the windows build." into klp-dev
am: da66b9100a

Change-Id: If9b3829707e7fc6d9846bc769108180e08d67b5f