Merge "Merge branch 'master' into nextgenv2" into nextgenv2

diff --cc vp10/common/blockd.h
Simple merge

diff --cc vp10/common/entropy.h
Simple merge

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

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

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

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

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

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

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