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

Conflicts:
	configure

Change-Id: I2ce6b0a0507f9aa4e3fed8ea1cb69779db5f4566

diff --cc configure
index 371f17597251ff972eb4ad70124f6441b127163b,b79aee4e31cc59eaed4df772665956a11b9535bd..225ffa49cc395f2ae9ee0fd9c2fdcf758de48346
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -214,8 -214,7 +214,9 @@@ HAVE_LIST=
      sys_mman_h
  "
  EXPERIMENT_LIST="
+     extend_qrange
 +    segmentation
 +    csm
  "
  CONFIG_LIST="
      external_build

diff --cc vp8/common/blockd.h
Simple merge

diff --cc vp8/decoder/decodframe.c
Simple merge

diff --cc vp8/decoder/onyxd_if.c
Simple merge

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

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