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

Change-Id: Ia706579c1d4f995956c91ffba7aa86e3da4e82d5