Merge branch 'master' into nextgenv2

diff --cc test/test.mk
Simple merge

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

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

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

diff --cc vpx_dsp/intrapred.c
Simple merge