Merge remote branch 'internal/upstream' into HEAD

diff --cc vp8/encoder/bitstream.c
index cb0846046b7701ef90bb44609ca8a53d00801d27,adbd106980e5f6efee411d53e2d680b6ef38d8f8..db883c7d6ed80dd8841c86ff06f24739c992bf40
--- 1/vp8/encoder/bitstream.c
--- 2/vp8/encoder/bitstream.c
+++ b/vp8/encoder/bitstream.c
@@@ -1711,11 -1632,24 +1712,26 @@@ void vp8_pack_bitstream(VP8_COMP *cpi, 
          active_section = 1;
  #endif
      }
 -
 +#if CONFIG_SEGMENTATION
 +    //printf("%d\n",segment_cost);
 +#endif
      vp8_stop_encode(bc);
  
+     oh.first_partition_length_in_bytes = cpi->bc.pos;
+ 
+     /* update frame tag */
+     {
+         int v = (oh.first_partition_length_in_bytes << 5) |
+                 (oh.show_frame << 4) |
+                 (oh.version << 1) |
+                 oh.type;
+ 
+         dest[0] = v;
+         dest[1] = v >> 8;
+         dest[2] = v >> 16;
+     }
+ 
+     *size = VP8_HEADER_SIZE + extra_bytes_packed + cpi->bc.pos;
  
      if (pc->multi_token_partition != ONE_PARTITION)
      {