Merge remote branch 'origin/master' into experimental

Change-Id: I6f77e7c10a54c54b26126b8acd5edd0a03358a41

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

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

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

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

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