Merge "Make the row based multi-threaded encoder deterministic"

diff --cc vp9/encoder/vp9_encodeframe.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_pickmode.c
Simple merge

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

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