Merge remote branch 'internal/upstream' into HEAD

Conflicts:
	configure

Change-Id: I1c7bae5241f999387cae3f2abf2dfc84fe3f6651

diff --cc configure
index 9a7da9ce5d472c3e839741c7958bba86cb1e3a59,f32fffe38daf2a3e4f3776591ffe383fced48f52..ed320368f3e5d36841d49955882f22feb1fb584a
--- 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
@@@ -294,7 -291,7 +296,9 @@@
      shared
      small
      arm_asm_detok
+     postproc_visualizer
++
 +    experimental
  "
  
  process_cmdline() {

diff --cc vp8/vp8_cx_iface.c
Simple merge