Merge remote branch 'internal/upstream' into HEAD

diff --cc configure
index 20564fd353a87072cd7b3581077ff2c0365dec7e,0f55de3afa074ab2658db3b89b6ca0651221a6af..7158c4fca45c594576887be3cf170b089d276d24
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -260,12 -254,8 +259,11 @@@ CONFIG_LIST=
      realtime_only
      shared
      small
-     arm_asm_detok
      postproc_visualizer
      os_support
 +
 +    experimental
 +    ${EXPERIMENT_LIST}
  "
  CMDLINE_SELECT="
      extra_warnings
@@@ -304,10 -294,7 +302,9 @@@
      realtime_only
      shared
      small
-     arm_asm_detok
      postproc_visualizer
 +
 +    experimental
  "
  
  process_cmdline() {

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

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

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

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