Revert "Reapply r922 with the dependencies reversed."
Revert "Reapply r922 with the dependencies reversed."

This reverts r922.  It also regressed Windows builds.

TBR=mark
witwall/gyp,witwall/gyp,witwall/gyp,witwall/gyp,witwall/gyp