Merge "Remove some SIMD recognition code." am: 3d995b55a9
am: 8b767d9a57

Change-Id: I1e372b0b5cc26a933dc6b536e7e63d0617d2f0c9