Revert 4001 "Revert 3977"
Revert 4001 "Revert 3977"

> Revert 3977
> BUG=webrtc:1749
> 
> > Update protoc.gypi to match Chromium's latest.
> > 
> > This is in preparation for enabling protobufs in Chromium. Requires
> > syncing tools/protoc_wrapper.
> > 
> > BUG=webrtc:830
> > R=kjellander@webrtc.org
> > 
> > Review URL: https://webrtc-codereview.appspot.com/1426004
> 
> TBR=andrew@webrtc.org
> Review URL: https://webrtc-codereview.appspot.com/1453005

TBR=tnakamura@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1515004

git-svn-id: 03ae4fbe531b1eefc9d815f31e49022782c42458@4070 4adac7df-926f-26a2-2b94-8c16560cd09d

PersonifyInc/chromium_webrtc,sippet/webrtc,android-ia/platform_external_chromium_org_third_party_webrtc,xin3liang/platform_external_chromium_org_third_party_webrtc,android-ia/platform_external_chromium_org_third_party_webrtc,SlimXperiments/external_chromium_org_third_party_webrtc,bpsinc-native/src_third_party_webrtc,jgcaaprom/android_external_chromium_org_third_party_webrtc,geekboxzone/lollipop_external_chromium_org_third_party_webrtc,android-ia/platform_external_chromium_org_third_party_webrtc,sippet/webrtc,lukeweber/webrtc-src-override,jgcaaprom/android_external_chromium_org_third_party_webrtc,CyanogenMod/android_external_chromium_org_third_party_webrtc,krieger-od/webrtc,AOSPU/external_chromium_org_third_party_webrtc,geekboxzone/lollipop_external_chromium_org_third_party_webrtc,jchavanton/webrtc,bpsinc-native/src_third_party_webrtc,geekboxzone/lollipop_external_chromium_org_third_party_webrtc,aleonliao/webrtc-trunk,Omegaphora/external_chromium_org_third_party_webrtc,android-ia/platform_external_chromium_org_third_party_webrtc,MIPS/external-chromium_org-third_party-webrtc,CyanogenMod/android_external_chromium_org_third_party_webrtc,CyanogenMod/android_external_chromium_org_third_party_webrtc,AOSPU/external_chromium_org_third_party_webrtc,android-ia/platform_external_chromium_org_third_party_webrtc,aleonliao/webrtc-trunk,lukeweber/webrtc-src-override,SlimXperiments/external_chromium_org_third_party_webrtc,jchavanton/webrtc,bpsinc-native/src_third_party_webrtc,jgcaaprom/android_external_chromium_org_third_party_webrtc,krieger-od/webrtc,AOSPU/external_chromium_org_third_party_webrtc,jgcaaprom/android_external_chromium_org_third_party_webrtc,Omegaphora/external_chromium_org_third_party_webrtc,bpsinc-native/src_third_party_webrtc,sippet/webrtc,jchavanton/webrtc,aleonliao/webrtc-trunk,xin3liang/platform_external_chromium_org_third_party_webrtc,PersonifyInc/chromium_webrtc,AOSPU/external_chromium_org_third_party_webrtc,jchavanton/webrtc,Alkalyne/webrtctrunk,Omegaphora/external_chromium_org_third_party_webrtc,Alkalyne/webrtctrunk,krieger-od/nwjs_chromium_webrtc,SlimXperiments/external_chromium_org_third_party_webrtc,AOSPU/external_chromium_org_third_party_webrtc,MIPS/external-chromium_org-third_party-webrtc,bpsinc-native/src_third_party_webrtc,sippet/webrtc,Omegaphora/external_chromium_org_third_party_webrtc,android-ia/platform_external_chromium_org_third_party_webrtc,MIPS/external-chromium_org-third_party-webrtc,svn2github/webrtc-Revision-8758,PersonifyInc/chromium_webrtc,krieger-od/webrtc,xin3liang/platform_external_chromium_org_third_party_webrtc,xin3liang/platform_external_chromium_org_third_party_webrtc,MIPS/external-chromium_org-third_party-webrtc,aleonliao/webrtc-trunk,SlimXperiments/external_chromium_org_third_party_webrtc,aleonliao/webrtc-trunk,jchavanton/webrtc,aleonliao/webrtc-trunk,geekboxzone/lollipop_external_chromium_org_third_party_webrtc,Omegaphora/external_chromium_org_third_party_webrtc,krieger-od/nwjs_chromium_webrtc,android-ia/platform_external_chromium_org_third_party_webrtc,AOSPU/external_chromium_org_third_party_webrtc,svn2github/webrtc-Revision-8758,MIPS/external-chromium_org-third_party-webrtc,PersonifyInc/chromium_webrtc,jgcaaprom/android_external_chromium_org_third_party_webrtc,sippet/webrtc,jgcaaprom/android_external_chromium_org_third_party_webrtc,SlimXperiments/external_chromium_org_third_party_webrtc,SlimXperiments/external_chromium_org_third_party_webrtc,AOSPU/external_chromium_org_third_party_webrtc,lukeweber/webrtc-src-override,krieger-od/webrtc,MIPS/external-chromium_org-third_party-webrtc,xin3liang/platform_external_chromium_org_third_party_webrtc,krieger-od/nwjs_chromium_webrtc,Alkalyne/webrtctrunk,xin3liang/platform_external_chromium_org_third_party_webrtc,lukeweber/webrtc-src-override,krieger-od/nwjs_chromium_webrtc,Alkalyne/webrtctrunk,jchavanton/webrtc,lukeweber/webrtc-src-override,Alkalyne/webrtctrunk,krieger-od/nwjs_chromium_webrtc,Alkalyne/webrtctrunk,svn2github/webrtc-Revision-8758,geekboxzone/lollipop_external_chromium_org_third_party_webrtc,jgcaaprom/android_external_chromium_org_third_party_webrtc,CyanogenMod/android_external_chromium_org_third_party_webrtc,MIPS/external-chromium_org-third_party-webrtc,krieger-od/webrtc,bpsinc-native/src_third_party_webrtc,krieger-od/nwjs_chromium_webrtc,Alkalyne/webrtctrunk,CyanogenMod/android_external_chromium_org_third_party_webrtc,geekboxzone/lollipop_external_chromium_org_third_party_webrtc,jgcaaprom/android_external_chromium_org_third_party_webrtc,android-ia/platform_external_chromium_org_third_party_webrtc,Omegaphora/external_chromium_org_third_party_webrtc,jchavanton/webrtc,sippet/webrtc,Omegaphora/external_chromium_org_third_party_webrtc,SlimXperiments/external_chromium_org_third_party_webrtc,krieger-od/webrtc,geekboxzone/lollipop_external_chromium_org_third_party_webrtc,lukeweber/webrtc-src-override,MIPS/external-chromium_org-third_party-webrtc,svn2github/webrtc-Revision-8758,lukeweber/webrtc-src-override,Alkalyne/webrtctrunk,PersonifyInc/chromium_webrtc,bpsinc-native/src_third_party_webrtc,PersonifyInc/chromium_webrtc,geekboxzone/lollipop_external_chromium_org_third_party_webrtc,CyanogenMod/android_external_chromium_org_third_party_webrtc,svn2github/webrtc-Revision-8758,xin3liang/platform_external_chromium_org_third_party_webrtc,CyanogenMod/android_external_chromium_org_third_party_webrtc,svn2github/webrtc-Revision-8758,Omegaphora/external_chromium_org_third_party_webrtc,bpsinc-native/src_third_party_webrtc