[automerger skipped] adb: fix windows test build.
am: 83ebd8da84  -s ours

Change-Id: Iaeedac9eb300dea9f22c47492215e14e782c6b3f