Merge "Remove UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true setting (reland)." am: bc31e5108b am: ac5c23c286 am: 0d06e3456c

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1869977

Change-Id: Ia28c3418b45b5032a35082803c5a4154a1b14152

build/build_unbundled_mainline_module.sh

@@ -118,8 +118,10 @@ function init() {
 
   # This script cannot handle compressed apexes
   declare -grx OVERRIDE_PRODUCT_COMPRESSED_APEX=false
-  # Unset to build using PreBuilt SDK.
-  declare -grx UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true
+
+  # UNBUNDLED_BUILD_SDKS_FROM_SOURCE defaults to false, which is necessary to
+  # use prebuilt SDKs on thin branches that may not have the sources (e.g.
+  # frameworks/base).
 }
 
 function main() {