Merge "Temporary disable new round implementation on x86/x86_64"
am: 9526d13c79

Change-Id: I8e434f8e3cd7808fb068fcaea772e2eec6b455a5