Merge branch 'master' into nextgenv2

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

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

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