Merge remote branch 'origin/master' into experimental

Change-Id: I4b1a7a2ad0d62bdcabfed66c9dfdbe9b6bfa8b5e

diff --cc configure
index a260da0cfaa293c905001a13fe7f289999b31366,0f55de3afa074ab2658db3b89b6ca0651221a6af..5171f2d95d43b779547bf64f03ff9b5a58f62e38
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -258,12 -254,8 +257,11 @@@ CONFIG_LIST=
      realtime_only
      shared
      small
-     arm_asm_detok
      postproc_visualizer
      os_support
 +
 +    experimental
 +    ${EXPERIMENT_LIST}
  "
  CMDLINE_SELECT="
      extra_warnings
@@@ -300,10 -292,8 +298,9 @@@
      mem_tracker
      spatial_resampling
      realtime_only
 +    experimental
      shared
      small
-     arm_asm_detok
      postproc_visualizer
  "
  

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

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

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