Fix logic in rd_pick_intra4x4block()
Fix logic in rd_pick_intra4x4block()

Fix the merge issue due to pvq. This fixes significant key frame
performance loss.

Change-Id: I5fef4648cfc9e94f63b553ac15e051a6c4d4ca13

mbebenita/aom,smarter/aom,mbebenita/aom,mbebenita/aom,GrokImageCompression/aom,GrokImageCompression/aom,smarter/aom,GrokImageCompression/aom,luctrudeau/aom,GrokImageCompression/aom,mbebenita/aom,luctrudeau/aom,mbebenita/aom,smarter/aom,smarter/aom,mbebenita/aom,smarter/aom,GrokImageCompression/aom,luctrudeau/aom,mbebenita/aom,mbebenita/aom,luctrudeau/aom,luctrudeau/aom,luctrudeau/aom,smarter/aom,mbebenita/aom,GrokImageCompression/aom