Merge branch 'master' into nextgenv2

Change-Id: Id0b784b115602e2502b42fa972a5ae210435a3be

diff --cc vp10/decoder/decodeframe.c
Simple merge

diff --cc vp10/encoder/bitstream.c
Simple merge

diff --cc vp10/encoder/block.h
Simple merge

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

diff --cc vp10/encoder/encoder.c
Simple merge

diff --cc vp10/encoder/encoder.h
Simple merge

diff --cc vp10/encoder/ethread.c
Simple merge

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