This commit reapplies 205018. After 205855 we should correctly vectorize intrinsics. llvm-svn: 205965