Merge remote branch 'internal/upstream' into HEAD

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

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

diff --cc vp8/encoder/onyx_int.h
Simple merge

diff --cc vp8/vp8_common.mk
Simple merge

diff --cc vpxenc.c
index d4ff1fc02bbf74ac05597498d42d2d8dd4c2228b,4baeefcdf034410c904b535b788f0d4221fa6785..c77996dcf26d97aa1f6f8831c44508bfd123ed2b
mode 100644,100755..100755
--- 1/vpxenc.c
--- 2/vpxenc.c
+++ b/vpxenc.c