Merge remote branch 'internal/upstream' into HEAD

diff --cc vp8/common/blockd.h
Simple merge

diff --cc vp8/common/onyxc_int.h
Simple merge

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

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

diff --cc vp8/encoder/generic/csystemdependent.c
Simple merge

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