Merge cherrypicks of [3156476, 3155698, 3156194, 3156639, 3156018, 3156477, 3156098, 3156099, 3156100, 3156101, 3156102, 3158393, 3155699, 3155700, 3156195, 3156196, 3156019, 3156020, 3158394] into oc-mr1-release

Change-Id: I566bce4d8826a747cf52a8bffb73505899a413bd
diff --git a/sdk/build_tools_source.prop_template b/sdk/build_tools_source.prop_template
index 13f84d9..02d26a7 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=26.0.3
+Pkg.Revision=${PLATFORM_SDK_VERSION}.0.1
+#Pkg.Revision=26.0.3