Merge remote branch 'internal/upstream' into HEAD

diff --cc vp8/common/generic/systemdependent.c
Simple merge

diff --cc vp8/common/reconintra4x4.c
Simple merge

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

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

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

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

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

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

diff --cc vp8/vp8_common.mk
Simple merge

diff --cc vpxenc.c
Simple merge