Merge cherrypicks of [12982162, 12984235, 12984148, 12984149] into rvc-qpr1-release

Change-Id: Idd5e332200277408c505e08f5b9ec6932f32b9b7
diff --git a/sdk/build_tools_source.prop_template b/sdk/build_tools_source.prop_template
index 90ecc2a..fb40467 100644
--- a/sdk/build_tools_source.prop_template
+++ b/sdk/build_tools_source.prop_template
@@ -1,3 +1,3 @@
 Pkg.UserSrc=false
-Pkg.Revision=${PLATFORM_SDK_VERSION}.0.2
+Pkg.Revision=${PLATFORM_SDK_VERSION}.0.3
 #Pkg.Revision=30.0.0 rc4