The change in encodeframe.c has no effect (it's the same test), but
the change in rdopt.c fixes a miscalculated rate for (say) 8x4 blocks
which must signal whether to use TX_8X4 or TX_4X4.

Change-Id: I1dd2556bb90e86e690dd1fabaad278813ba73ea6