Merge branch 'master' into experimental

Conflicts:
	vp9/common/vp9_findnearmv.c
	vp9/common/vp9_rtcd_defs.sh
	vp9/decoder/vp9_decodframe.c
	vp9/decoder/x86/vp9_dequantize_sse2.c
	vp9/encoder/vp9_rdopt.c
	vp9/vp9_common.mk

Resolve file name changes in favor of master. Resolve rdopt changes in
favor of experimental, preserving the newer experiments.

Change-Id: If51ed8f457470281c7b20a5c1a2f4ce2cf76c20f

diff --cc build/make/configure.sh
Simple merge

diff --cc test/acm_random.h
index 84c6c75,13903c6..cd33d12
--- 1/test/acm_random.h
--- 2/test/acm_random.h
+++ b/test/acm_random.h
@@@ -32,18 -28,14 +28,21 @@@ class ACMRandom 
    }
  
    uint8_t Rand8(void) {
-     return (rand() >> 8) & 0xff;
+     const uint32_t value =
+         random_.Generate(testing::internal::Random::kMaxRange);
+     // There's a bit more entropy in the upper bits of this implementation.
+     return (value >> 24) & 0xff;
    }
  
 +  uint8_t Rand8Extremes(void) {
 +    // Returns a random value near 0 or near 255, to better exercise
 +    // saturation behavior.
 +    const uint8_t r = Rand8();
 +    return r < 128 ? r << 4 : r >> 4;
 +  }
 +
    int PseudoUniform(int range) {
-     return (rand() >> 8) % range;
+     return random_.Generate(range);
    }
  
    int operator()(int n) {

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

diff --cc vp9/decoder/vp9_decodframe.c
index 26f341a,eb1b489..62f8121
--- 1/vp9/decoder/vp9_decodframe.c
--- 2/vp9/decoder/vp9_decodframe.c
+++ b/vp9/decoder/vp9_decodframe.c
@@@ -1340,7 -1550,7 +1340,7 @@@ static void decode_tiles(VP9D_COMP *pbi
    if (pbi->oxcf.inv_tile_order) {
      const int n_cols = pc->tile_columns;
      const uint8_t *data_ptr2[4][1 << 6];
-     vp9_reader UNINITIALIZED_IS_SAFE(bc_bak);
 -    BOOL_DECODER bc_bak = {0};
++    vp9_reader bc_bak = {0};
  
      // pre-initialize the offsets, we're going to read in inverse order
      data_ptr2[0][0] = data_ptr;

diff --cc vp9/decoder/x86/vp9_dequantize_sse2.c
index cbe8181,1dfb8e0..1296b70
--- 1/vp9/decoder/x86/vp9_dequantize_x86.c
--- 2/vp9/decoder/x86/vp9_dequantize_sse2.c
+++ b/vp9/decoder/x86/vp9_dequantize_sse2.c
@@@ -15,9 -15,8 +15,7 @@@
  #include "vp9/common/vp9_common.h"
  #include "vp9/common/vp9_idct.h"
  
- #if HAVE_SSE2
- 
 -void vp9_add_residual_4x4_sse2(const int16_t *diff, const uint8_t *pred,
 -                               int pitch, uint8_t *dest, int stride) {
 +void vp9_add_residual_4x4_sse2(const int16_t *diff, uint8_t *dest, int stride) {
    const int width = 4;
    const __m128i zero = _mm_setzero_si128();
  

diff --cc vp9/encoder/vp9_sad_c.c
Simple merge

diff --cc vp9/vp9_common.mk
Simple merge

diff --cc vp9/vp9_dx_iface.c
Simple merge

diff --cc vp9/vp9cx.mk
Simple merge

diff --cc vp9/vp9dx.mk
Simple merge