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

Change-Id: I4cd639776fb19959b5b72302fcdb052c1d7a4786