make: Revert r928 and r918.
make: Revert r928 and r918.

These changes are correct, but we have many incorrect build files
in the Chrome tree.  We can't implement these changes until the build
files are fixed.

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

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

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