Revert "Fixes issue with Windows ADB zip results failing." am: 1cd9ba989a am: 3ba9b2f238
am: 00db1557a2

Change-Id: I4645d419e91d6e1e38571749d5a2762e2c35cf0e