Due to test failure of check-builtins for aarch64 and armhf. This reverts commit r297566. llvm-svn: 297569