Fixing name colission with options vs settings. Taking out left in print.
Fixing name colission with options vs settings.
Taking out left in print.


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

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