[6.2] Update Android root folder

This is a cherry-pick of #943

Author: Steelskin

.github/workflows/swift-toolchain.yml

@@ -3963,7 +3963,7 @@ jobs:
               -p:ANDROID_INCLUDE_DS2=true `
               -p:CERTIFICATE=${env:CERTIFICATE} `
               -p:PASSPHRASE=${{ secrets.PASSPHRASE }} `
-              -p:ImageRoot=${{ github.workspace }}/BuildRoot/Library `
+              -p:ImageRoot=${{ github.workspace }}/BuildRoot/Library/Developer `
               -p:ProductVersion=${{ inputs.swift_version }} `
               -p:AndroidArchitectures="`"x86_64;aarch64;i686;armv7`"" `
               ${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/platforms/android/android.wixproj