Merge remote branch 'origin/master' into experimental

Change-Id: I242ca4854cb21f3d63efb979bd6ecc9f06f67f33

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

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

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

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