Merge remote branch 'origin/master' into experimental

Conflicts:
	configure

Change-Id: Ifa63e4610657f75cb953aa7ca08f997267612cc0

diff --cc configure
index ab86fa01ca1e20c93f7315ec7f4041e9a6c0b6b8,f32fffe38daf2a3e4f3776591ffe383fced48f52..748e6988090ed60c185fb18bae29fffdd8da4664
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -252,9 -251,7 +253,10 @@@ CONFIG_LIST=
      shared
      small
      arm_asm_detok
+     postproc_visualizer
 +
 +    experimental
 +    ${EXPERIMENT_LIST}
  "
  CMDLINE_SELECT="
      extra_warnings

diff --cc vp8/vp8_cx_iface.c
Simple merge