Fixing bad merge with my other change.
Fixing bad merge with my other change.

Review URL: http://codereview.chromium.org/113508

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

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