Merge branch 'master' into nextgenv2

diff --cc test/vp9_ethread_test.cc
Simple merge

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

diff --cc vp9/encoder/vp9_encodeframe.c
Simple merge

diff --cc vp9/encoder/vp9_encoder.c
Simple merge

diff --cc vpx_dsp/intrapred.c
Simple merge