Merge "Revert^2 "Update clang version to clang-r487747""