Merge "Support for a fast diamond search"

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

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

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

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

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