Merge branch 'masterbase' into nextgenv2

Conflicts:
	vp10/encoder/rdopt.c

Change-Id: If720e7f9810378d24bf9fd51a95fd29c3bc5d774

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

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

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

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

diff --cc vpx_dsp/intrapred.c
Simple merge