Merge "Full enable new round implementation on x86/x86_64"