Merge "neon fast quantize block pair"

diff --cc vp8/encoder/block.h
Simple merge

diff --cc vp8/encoder/encodeframe.c
Simple merge

diff --cc vp8/encoder/ethreading.c
Simple merge

diff --cc vp8/encoder/onyx_if.c
Simple merge