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

git-svn-id: e7e1075985beda50ea81ac4472467b4f6e91fc78@1078 78cadc50-ecff-11dd-a971-7dbc132099af

svn2github/gyp,carlTLR/gyp,kevinchen3315/gyp-git,luvit/gyp,AWhetter/gyp,bdarnell/gyp,alexcrichton/gyp,azunite/gyp_20150930,Omegaphora/external_chromium_org_tools_gyp,cysp/gyp,ryfx/gyp,clar/gyp,clar/gyp,trafi/gyp,azunite/gyp,mkrautz/gyp-libmumble,openpeer/webrtc-gyp,chromium/gyp,mapbox/gyp,bnq4ever/gypgoogle,alexcrichton/gyp,dougbeal/gyp,Chilledheart/gyp,cchamberlain/gyp,bpsinc-native/src_tools_gyp,ryfx/gyp,duanhjlt/gyp,ttyangf/pdfium_gyp,trafi/gyp,AOSPU/external_chromium_org_tools_gyp,omasanori/gyp,mapbox/gyp,saghul/gyn,enkripsi/gyp,yangrongwei/gyp,mkrautz/gyp-libmumble,mumble-voip/libmumble-gyp,carlTLR/gyp,azunite/gyp_20150930,tarc/gyp,cysp/gyp,AOSPU/external_chromium_org_tools_gyp,bdarnell/gyp,sanyaade-teachings/gyp,okumura/gyp,msc-/gyp,omasanori/gyp,Jack-Q/GYP-copy,svn2github/kgyp,sport-monkey/GYP,bnoordhuis/gyp,duanhjlt/gyp,amoikevin/gyp,ttyangf/pdfium_gyp,IllusionRom-deprecated/android_platform_external_chromium_org_tools_gyp,luvit/gyp,mistydemeo/gyp,Chilledheart/gyp,bnoordhuis/gyp,ryfx/gyp,svn2github/kgyp,trafi/gyp,luvit/gyp,brson/gyp,turbulenz/gyp,okumura/gyp,yjhjstz/gyp,Phuehvk/gyp,omasanori/gyp,IllusionRom-deprecated/android_platform_external_chromium_org_tools_gyp,saghul/gyn,sdklite/gyp,msc-/gyp,erikge/watch_gyp,Phuehvk/gyp,pandaxcl/gyp,mgamer/gyp,chromium/gyp,bulldy80/gyp_unofficial,msc-/gyp,cchamberlain/gyp,kevinchen3315/gyp-git,svn2github/kgyp,springmeyer/gyp,cysp/gyp,Omegaphora/external_chromium_org_tools_gyp,IllusionRom-deprecated/android_platform_external_chromium_org_tools_gyp,cysp/gyp,geekboxzone/lollipop_external_chromium_org_tools_gyp,mistydemeo/gyp,cchamberlain/gyp,AWhetter/gyp,android-ia/platform_external_chromium_org_tools_gyp,MIPS/external-chromium_org-tools-gyp,Danath/gyp,carlTLR/gyp,channing/gyp,adblockplus/gyp,yinquan529/platform-external-chromium_org-tools-gyp,Omegaphora/external_chromium_org_tools_gyp,android-ia/platform_external_chromium_org_tools_gyp,bdarnell/gyp,Danath/gyp,brson/gyp,pyokagan/gyp,erikge/watch_gyp,msc-/gyp,pyokagan/gyp,trafi/gyp,svn2github/kgyp,okwasi/gyp,springmeyer/gyp,sport-monkey/GYP,adblockplus/gyp,mistydemeo/gyp,sdklite/gyp,adblockplus/gyp,AOSPU/external_chromium_org_tools_gyp,LazyCodingCat/gyp,bpsinc-native/src_tools_gyp,azunite/gyp,azunite/gyp,mumble-voip/libmumble-gyp,amoikevin/gyp,lianliuwei/gyp,lianliuwei/gyp,Phuehvk/gyp,lukeweber/gyp-override,bnoordhuis/gyp,Phuehvk/gyp,amoikevin/gyp,svn2github/gyp,cysp/gyp,xin3liang/platform_external_chromium_org_tools_gyp,bulldy80/gyp_unofficial,bpsinc-native/src_tools_gyp,azunite/gyp,cchamberlain/gyp,alexcrichton/gyp,pandaxcl/gyp,sdklite/gyp,pyokagan/gyp,Danath/gyp,pandaxcl/gyp,AWhetter/gyp,ttyangf/pdfium_gyp,pandaxcl/gyp,mgamer/gyp,tarc/gyp,okwasi/gyp,bdarnell/gyp,AOSPU/external_chromium_org_tools_gyp,yinquan529/platform-external-chromium_org-tools-gyp,springmeyer/gyp,ttyangf/gyp,turbulenz/gyp,clar/gyp,azunite/gyp_20150930,AWhetter/gyp,android-ia/platform_external_chromium_org_tools_gyp,Phuehvk/gyp,okwasi/gyp,saghul/gyn,LazyCodingCat/gyp,chromium/gyp,geekboxzone/lollipop_external_chromium_org_tools_gyp,sport-monkey/GYP,IllusionRom-deprecated/android_platform_external_chromium_org_tools_gyp,mgamer/gyp,lianliuwei/gyp,okumura/gyp,yangrongwei/gyp,ryfx/gyp,sanyaade-teachings/gyp,springmeyer/gyp,geekboxzone/lollipop_external_chromium_org_tools_gyp,adblockplus/gyp,xin3liang/platform_external_chromium_org_tools_gyp,sanyaade-teachings/gyp,kevinchen3315/gyp-git,enkripsi/gyp,openpeer/webrtc-gyp,Jack-Q/GYP-copy,okumura/gyp,azunite/gyp_20150930,bpsinc-native/src_tools_gyp,bnq4ever/gypgoogle,ttyangf/pdfium_gyp,clar/gyp,bnq4ever/gypgoogle,erikge/watch_gyp,enkripsi/gyp,springmeyer/gyp,pyokagan/gyp,bnoordhuis/gyp,ttyangf/gyp,dougbeal/gyp,openpeer/webrtc-gyp,mkrautz/gyp-libmumble,mgamer/gyp,MIPS/external-chromium_org-tools-gyp,LazyCodingCat/gyp,turbulenz/gyp,bulldy80/gyp_unofficial,xin3liang/platform_external_chromium_org_tools_gyp,svn2github/gyp,amoikevin/gyp,bnq4ever/gypgoogle,mapbox/gyp,pyokagan/gyp,Chilledheart/gyp,kevinchen3315/gyp-git,sloanyang/gyp,enkripsi/gyp,luvit/gyp,sloanyang/gyp,okwasi/gyp,bulldy80/gyp_unofficial,amoikevin/gyp,carlTLR/gyp,sanyaade-teachings/gyp,yjhjstz/gyp,carlTLR/gyp,omasanori/gyp,saghul/gyn,lukeweber/gyp-override,MIPS/external-chromium_org-tools-gyp,svn2github/kgyp,clar/gyp,mkrautz/gyp-libmumble,android-ia/platform_external_chromium_org_tools_gyp,lianliuwei/gyp,channing/gyp,tarc/gyp,tarc/gyp,ttyangf/gyp,alexcrichton/gyp,ttyangf/gyp,ttyangf/gyp,duanhjlt/gyp,Danath/gyp,LazyCodingCat/gyp,sdklite/gyp,trafi/gyp,sanyaade-teachings/gyp,brson/gyp,geekboxzone/lollipop_external_chromium_org_tools_gyp,bnq4ever/gypgoogle,openpeer/webrtc-gyp,svn2github/gyp,yangrongwei/gyp,cchamberlain/gyp,Jack-Q/GYP-copy,svn2github/gyp,mistydemeo/gyp,LazyCodingCat/gyp,yinquan529/platform-external-chromium_org-tools-gyp,MIPS/external-chromium_org-tools-gyp,lukeweber/gyp-override,bulldy80/gyp_unofficial,enkripsi/gyp,channing/gyp,turbulenz/gyp,sloanyang/gyp,mumble-voip/libmumble-gyp,yinquan529/platform-external-chromium_org-tools-gyp,yangrongwei/gyp,bnoordhuis/gyp,yjhjstz/gyp,chromium/gyp,sdklite/gyp,azunite/gyp,Omegaphora/external_chromium_org_tools_gyp,mapbox/gyp,azunite/gyp_20150930,dougbeal/gyp,erikge/watch_gyp,Jack-Q/GYP-copy,turbulenz/gyp,sport-monkey/GYP,mumble-voip/libmumble-gyp,yjhjstz/gyp,adblockplus/gyp,msc-/gyp,openpeer/webrtc-gyp,chromium/gyp,channing/gyp,AWhetter/gyp,yjhjstz/gyp,duanhjlt/gyp,pandaxcl/gyp,erikge/watch_gyp,xin3liang/platform_external_chromium_org_tools_gyp,mapbox/gyp,tarc/gyp,sloanyang/gyp,dougbeal/gyp,ryfx/gyp,Chilledheart/gyp,saghul/gyn,brson/gyp,ttyangf/pdfium_gyp,Danath/gyp,dougbeal/gyp,mgamer/gyp,Jack-Q/GYP-copy,sport-monkey/GYP,lukeweber/gyp-override,duanhjlt/gyp,Chilledheart/gyp