Back out r658, which caused test failures:
Back out r658, which caused test failures:

http://build.chromium.org/buildbot/waterfall.fyi/builders/GYP%20Mac/builds/51/steps/shell_2/logs/stdio


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

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