Merge remote branch 'internal/upstream' into HEAD

diff --cc vp8/encoder/encodeframe.c
index b7d231b8cdc6f5ee1377ca4d96f4b5b578d41a06,2002735d22c9b52b4c5d552d1ae2712e0aee4d64..5f9e54b4b17eade1c94c75bc2ee7db6a83ff54d0
--- 1/vp8/encoder/encodeframe.c
--- 2/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@@ -592,8 -605,13 +654,9 @@@ void encode_mb_row(VP8_COMP *cpi
      // this is to account for the border
      xd->mode_info_context++;
      x->partition_info++;
+     x->activity_sum += activity_sum;
  }
  
 -
 -
 -
 -
  void vp8_encode_frame(VP8_COMP *cpi)
  {
      int mb_row;

diff --cc vp8/encoder/ethreading.c
Simple merge

diff --cc vp8/encoder/onyx_if.c
Simple merge

diff --cc vp8/encoder/onyx_int.h
Simple merge