Merge remote branch 'internal/upstream' into HEAD

Conflicts:
	configure

Change-Id: I0bc38a6558d0d7f62cd2c551e75c3a59e39008bd

diff --cc configure
index 225ffa49cc395f2ae9ee0fd9c2fdcf758de48346,cb568d7aaa6170b17539dec70dd41935dd213ba4..4aef55166588ad073b3522245b150abe7fab8d03
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -310,19 -300,7 +310,18 @@@ process_cmdline() 
          optval="${opt#*=}"
          case "$opt" in
          --disable-codecs) for c in ${CODECS}; do disable $c; done ;;
 -        *) process_common_cmdline "$opt"
 +        --enable-?*|--disable-?*)
 +        eval `echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g'`
 +        if echo "${EXPERIMENT_LIST}" | grep "^ *$option\$" >/dev/null; then
 +            if enabled experimental; then
 +                $action $option
 +            else
 +                log_echo "Ignoring $opt -- not in experimental mode."
 +            fi
 +        else
-             process_common_cmdline $opt
++            process_common_cmdline "$opt"
 +        fi
 +        ;;
-         *) process_common_cmdline $opt
          ;;
          esac
      done

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

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