Merge remote branch 'origin/master' into experimental

Change-Id: I44db27204081ef238cefb521f3ae728091c5c71b

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

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

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

diff --cc vp8/decoder/generic/dsystemdependent.c
Simple merge

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

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

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