Rollback of r6108
Rollback of r6108

BUG=N/A
R=mallinath@webrtc.org

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

git-svn-id: a556c8bde68cedbc0208a1ffc78b06e9cd07f676@6109 4adac7df-926f-26a2-2b94-8c16560cd09d

xin3liang/platform_external_chromium_org_third_party_libjingle_source_talk,AOSPU/external_chromium_org_third_party_libjingle_source_talk,android-ia/platform_external_chromium_org_third_party_libjingle_source_talk,xin3liang/platform_external_chromium_org_third_party_libjingle_source_talk,dcpang/fatline-libjingle,Omegaphora/external_chromium_org_third_party_libjingle_source_talk,Omegaphora/external_chromium_org_third_party_libjingle_source_talk,AOSPU/external_chromium_org_third_party_libjingle_source_talk,xin3liang/platform_external_chromium_org_third_party_libjingle_source_talk,sippet/talk,Omegaphora/external_chromium_org_third_party_libjingle_source_talk,geekboxzone/lollipop_external_chromium_org_third_party_libjingle_source_talk,bpsinc-native/src_third_party_libjingle_source_talk,bpsinc-native/src_third_party_libjingle_source_talk,AOSPU/external_chromium_org_third_party_libjingle_source_talk,Omegaphora/external_chromium_org_third_party_libjingle_source_talk,AOSPU/external_chromium_org_third_party_libjingle_source_talk,geekboxzone/lollipop_external_chromium_org_third_party_libjingle_source_talk,Omegaphora/external_chromium_org_third_party_libjingle_source_talk,bpsinc-native/src_third_party_libjingle_source_talk,android-ia/platform_external_chromium_org_third_party_libjingle_source_talk,android-ia/platform_external_chromium_org_third_party_libjingle_source_talk,bpsinc-native/src_third_party_libjingle_source_talk,sippet/talk,AOSPU/external_chromium_org_third_party_libjingle_source_talk,sippet/talk,geekboxzone/lollipop_external_chromium_org_third_party_libjingle_source_talk,Omegaphora/external_chromium_org_third_party_libjingle_source_talk,dcpang/fatline-libjingle,sippet/talk,dcpang/fatline-libjingle,bpsinc-native/src_third_party_libjingle_source_talk,bpsinc-native/src_third_party_libjingle_source_talk,geekboxzone/lollipop_external_chromium_org_third_party_libjingle_source_talk,dcpang/fatline-libjingle,android-ia/platform_external_chromium_org_third_party_libjingle_source_talk,android-ia/platform_external_chromium_org_third_party_libjingle_source_talk,sippet/talk,xin3liang/platform_external_chromium_org_third_party_libjingle_source_talk,geekboxzone/lollipop_external_chromium_org_third_party_libjingle_source_talk,android-ia/platform_external_chromium_org_third_party_libjingle_source_talk,xin3liang/platform_external_chromium_org_third_party_libjingle_source_talk,dcpang/fatline-libjingle