This patch simplies the checking criteria for the two groups of
compound modes. It also makes the encoder side cdf update inside the
RD loop consistent with that in the bitstream.

Experimental results on Google test sets (30 frames of lowres and
midres) confirm this patch obtains identical coding performance.

Change-Id: I170eea91f7d2be2170df544cfc2c692b09aa82d6