Fix an intricacy due to interactions between cb4x4 and var-tx that
sets frame header away from tx_mode_select. This resolves a rare
enc/dec mismatch issue.

Change-Id: I6981f21f7e6f04f2a47ef32f744f83a8fd34355b