Merge remote branch 'origin/master' into experimental

Change-Id: I67cc3b490266f958a1b3a935ec08ee19d7b4f6a0

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

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

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

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