Merge remote branch 'internal/upstream-experimental' into HEAD

Conflicts:
	vp8/encoder/encodeframe.c
	vp8/encoder/rdopt.c

Change-Id: I6ff3d92aa400bef10f6cc87f9da7ebaf6db8cc88

diff --cc vp8/encoder/encodeframe.c
index b4fc22c0b55406a288db8aa7be320a9a61c30a0e,5834e6f0805d9667445a702ae3a657c4d25fcce5..bd0477c645f3025fc297d470cc4b4e98ef6e368f
--- 1/vp8/encoder/encodeframe.c
--- 2/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@@ -782,9 -729,7 +782,6 @@@ void vp8_encode_frame(VP8_COMP *cpi
  
      vp8cx_frame_init_quantizer(cpi);
  
-     vp8_initialize_rd_consts(cpi,
-                              vp8_dc_quant(cm->base_qindex, cm->y1dc_delta_q));
- 
 -    vp8_initialize_rd_consts(cpi, cm->base_qindex + cm->y1dc_delta_q);
      vp8cx_initialize_me_consts(cpi, cm->base_qindex);
  
      if(cpi->oxcf.tuning == VP8_TUNE_SSIM)