Merge "SIMD type conversion for x86"
am: cfdd3ea01e

Change-Id: I166f0b28b11235b086b7c1917870d32e74ae1982