Merge WebRTC r18998 and r19018 to M60 branch

webrtc/modules/video_coding/codecs/vp8/temporal_layers.h

Index: webrtc/modules/video_coding/codecs/vp8/temporal_layers.h
diff --git a/webrtc/modules/video_coding/codecs/vp8/temporal_layers.h b/webrtc/modules/video_coding/codecs/vp8/temporal_layers.h
index 9b122919380684bf651d35fc7753bda93496c976..b3601e69f0d6aa15ba498d55ce8f436649093eb1 100644
--- a/webrtc/modules/video_coding/codecs/vp8/temporal_layers.h
+++ b/webrtc/modules/video_coding/codecs/vp8/temporal_layers.h
@@ -55,6 +55,16 @@ class TemporalLayers {
 
     int pattern_idx;
 
+    bool operator==(const FrameConfig& o) const {
+      return drop_frame == o.drop_frame &&
+             last_buffer_flags == o.last_buffer_flags &&
+             golden_buffer_flags == o.golden_buffer_flags &&
+             arf_buffer_flags == o.arf_buffer_flags &&
+             layer_sync == o.layer_sync && freeze_entropy == o.freeze_entropy &&
+             pattern_idx == o.pattern_idx;
+    }
+    bool operator!=(const FrameConfig& o) const { return !(*this == o); }
+
    private:
     FrameConfig(BufferFlags last,
                 BufferFlags golden,