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

Change-Id: Ie6f90d593cc9c5e3b89ba5734ca6719280f93a96