Merge changes I67543d36,I763f2924 into nextgenv2

* changes:
  Reduce shift in txfm8x8
  Let txfm's constant bit be the same for each stage