Merge "Adding 64x64 forward and inverse transforms" into nextgenv2