Merge "SIMD and-not for x86/x86_64" am: ba05290bb6
am: 1cea5dc4cc

Change-Id: Idfc05a3a97d4e8124d802907fba0062e8f8a81fe