Re-resolve conflict/collision between 1074 and 1076 commits.
Re-resolve conflict/collision between 1074 and 1076 commits.

TBR=jochen@chromium.org, thakis@chromium.org
TEST=gyptest.py test/rules
Review URL: http://codereview.chromium.org/8345010

csulmone/gyp,csulmone/gyp,csulmone/gyp,csulmone/gyp