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

Change-Id: Ie72fef86d54d4c0dc3c216ce4f01d28df098bf59