adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745  -s ours am: 8621700765 am: d0b35e9e1d
am: 08420b5826

Change-Id: I201b41b3fe33e7227c6d3335f5935acf18f9cfa9