Fix enc/dec mismatch when supertx and vartx are both turned on
Fix enc/dec mismatch when supertx and vartx are both turned on

BUG=aomedia:90

Change-Id: I66239b54017141929987eb49796b3b97081d3943

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