Cherry-pick r2710 and r2711 from trunk to stable
Review URL: https://webrtc-codereview.appspot.com/778005

git-svn-id: http://webrtc.googlecode.com/svn/stable/src@2713 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/modules/video_coding/codecs/test_framework/unit_test.cc b/modules/video_coding/codecs/test_framework/unit_test.cc
index 8184a2e..dbbbcf0 100644
--- a/modules/video_coding/codecs/test_framework/unit_test.cc
+++ b/modules/video_coding/codecs/test_framework/unit_test.cc
@@ -764,7 +764,7 @@
         if (_bitRate >= 100 && _bitRate <= 2500)
         {
             EXPECT_TRUE(abs(WebRtc_Word32(actualBitrate - _bitRate)) <
-                0.1 * _bitRate); // for VP8
+                0.12 * _bitRate); // for VP8
         }
         ASSERT_TRUE(feof(_sourceFile) != 0);
         rewind(_sourceFile);