Merge "Merge cherrypicks of ['android-review.googlesource.com/3452706', 'android-review.googlesource.com/3452707'] into ndk-r28-release." into ndk-r28-release

docs/changelogs/Changelog-r28.md

diff --git a/docs/changelogs/Changelog-r28.md b/docs/changelogs/Changelog-r28.md
index d5d6918..b77a49c 100644
--- a/docs/changelogs/Changelog-r28.md
+++ b/docs/changelogs/Changelog-r28.md
@@ -19,7 +19,7 @@
 
 ## Changes
 
-- Updated LLVM to clang-r530567b. See `clang_source_info.md` in the toolchain
+- Updated LLVM to clang-r530567c. See `clang_source_info.md` in the toolchain
   directory for version information.
   - Runtime libraries for non-Android have been removed reduce disk usage.
   - libc++ now includes debug info to aid debugging. This may make

ndk/config.py

diff --git a/ndk/config.py b/ndk/config.py
index 9ebcf1d..ea251af 100644
--- a/ndk/config.py
+++ b/ndk/config.py
@@ -3,7 +3,7 @@
 major = 28
 hotfix = 0
 hotfix_str = chr(ord("a") + hotfix) if hotfix else ""
-beta = 2
+beta = 3
 beta_str = "-beta{}".format(beta) if beta > 0 else ""
 canary = False
 canary_str = "-canary" if canary else ""

ndk/toolchains.py

diff --git a/ndk/toolchains.py b/ndk/toolchains.py
index 0be7bbe..326f73d 100644
--- a/ndk/toolchains.py
+++ b/ndk/toolchains.py
@@ -21,7 +21,7 @@
 import ndk.paths
 from ndk.hosts import Host, get_default_host
 
-CLANG_VERSION = "clang-r530567b"
+CLANG_VERSION = "clang-r530567c"
 
 
 HOST_TRIPLE_MAP = {