Merge "Adds compound wedge prediction modes" into nextgenv2

diff --cc vp10/common/entropymode.c
Simple merge

diff --cc vp10/common/entropymode.h
Simple merge

diff --cc vp10/common/thread_common.c
Simple merge

diff --cc vp10/common/vp10_rtcd_defs.pl
Simple merge

diff --cc vp10/decoder/decodeframe.c
Simple merge

diff --cc vp10/decoder/decodemv.c
Simple merge

diff --cc vp10/encoder/bitstream.c
Simple merge

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

diff --cc vp10/encoder/encoder.h
Simple merge

diff --cc vp10/encoder/rdopt.c
Simple merge