Merge "Prepare for dynamic frame resizing in the recode loop"

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

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

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