Fix error in previous change here: http://chromiumcodereview.appspot.com/9401016
Fix error in previous change here: http://chromiumcodereview.appspot.com/9401016

Future change should use generator variables for prefix/suffix rather than duplicated copies.

TBR=nico
Review URL: https://chromiumcodereview.appspot.com/9418014

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

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