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

Merge "adb: actually fix the windows build." into klp-dev am: da66b910 am: 0b4bd3fe am: 55d871c4 am: 8027acd1 am: 7e21e1ef am: fa961006 am: 50dcfdf4 am: f69ff66c am: 238a9801
am: ffcd14a9

Change-Id: I62537211751b865364bacaf8cf9c1d1596e76332