Merge remote branch 'internal/upstream' into HEAD

Conflicts:
	configure

Change-Id: I74063d859de31a62285c8908bcb1821e050b9f3c

diff --cc configure
index 4aef55166588ad073b3522245b150abe7fab8d03,ed1990607f3dd531ef65fbd9d517bb14348ed5ae..20564fd353a87072cd7b3581077ff2c0365dec7e
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -258,9 -257,7 +262,10 @@@ CONFIG_LIST=
      small
      arm_asm_detok
      postproc_visualizer
+     os_support
 +
 +    experimental
 +    ${EXPERIMENT_LIST}
  "
  CMDLINE_SELECT="
      extra_warnings

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

diff --cc vpxenc.c
Simple merge