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

Change-Id: Ic67f5e14491b6e685f898f4f8b7c15161cabb17a