Merge remote branch 'origin/master' into experimental

Change-Id: Idf2dead51d2936984eb9827dd6d2cb704817f4c8

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

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

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

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