Merge "Full enable new round implementation on x86/x86_64"
am: c531c21794

Change-Id: I8f0c2115bf64d733a9d548060a21449dbf57d18f