Bug 1035898: Include Windows in conditional in the GAPI manifest; r=dustin

(removed extra comment)
Merge default -> production

--HG--
branch : production