Merge "Update clang version to clang-r487747"