Merge remote branch 'origin/master' into experimental

Change-Id: I7d91efbc3662c86d6efa2d7495eb4689ccdb0ced

diff --cc vp8/common/generic/systemdependent.c
Simple merge

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

diff --cc vp8/encoder/encodeframe.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