adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7
am: 1ceca95f8e

Change-Id: I1c8c386d69b3528a9be8f1b2c0032ed04363a228