Merge remote branch 'origin/master' into experimental

Conflicts:
	configure

Change-Id: I91b9059e5b724a96368c7765c147fdf5a5ce03f2

diff --cc configure
index bbe58069af1d1c30a754e86804d16fb7ac6b8f15,7596d1124da3f24ed6cee17f3eb2d3e1bbf14e2b..86f2791aaf3a3cb3d5c99230f16e377e6588813c
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -299,6 -295,6 +301,8 @@@ CMDLINE_SELECT=
      shared
      small
      postproc_visualizer
++
++    experimental
  "
  
  process_cmdline() {

diff --cc vp8/common/alloccommon.c
Simple merge

diff --cc vp8/common/generic/systemdependent.c
Simple merge

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

diff --cc vp8/decoder/onyxd_int.h
Simple merge

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

diff --cc vp8/encoder/generic/csystemdependent.c
Simple merge

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

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