Merge cherrypicks of [14095947] into ndk-r23-release

Change-Id: Ia15bb4c417bc3f5f8b269926ecd7698c11314218
diff --git a/ndk/config.py b/ndk/config.py
index 3555414..2618280 100644
--- a/ndk/config.py
+++ b/ndk/config.py
@@ -4,9 +4,9 @@
 major = 23
 hotfix = 0
 hotfix_str = chr(ord('a') + hotfix) if hotfix else ''
-beta = 0
+beta = 3
 beta_str = '-beta{}'.format(beta) if beta > 0 else ''
-canary = True
+canary = False
 canary_str = '-canary' if canary else ''
 release = 'r{}{}{}{}'.format(major, hotfix_str, beta_str, canary_str)
 if __name__ == '__main__':