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 am: 7149e3e7 am: 058bae82 am: 5751e333 am: 79517d4f am: fc1a1dfd
am: a142c241

Change-Id: I786b9728e0e499170a52e980600cfaff71b79fc6