Merge remote branch 'origin/master' into experimental

Change-Id: I689f4624a53184a72258df575305eb1aa97e61ca

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

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

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

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