[android] optionally include DS2 in Android SDK

Conditionally include DS2 in the Android SDK when building the MSI with
`-p:ANDROID_INCLUDE_DS2=true` passed to `msbuild`. Has no impact on the
generated installer if this property is not set.

Author: andrurogerz

platforms/Windows/android_sdk/android_sdk.wixproj

@@ -7,6 +7,7 @@
 
     <DefineConstants>
       $(DefineConstants);
+      ANDROID_INCLUDE_DS2=$(ANDROID_INCLUDE_DS2);
       SwiftShimsPath=$(SwiftShimsPath);
     </DefineConstants>
   </PropertyGroup>

platforms/Windows/android_sdk/android_sdk.wxs

@@ -79,6 +79,9 @@
                 </Directory>
               </Directory>
             </Directory>
+            <Directory Name="$(ArchTriple)">
+              <Directory Id="Android_Library_ARCH_bin" Name="bin" />
+            </Directory>
           </Directory>
           <Directory Name="SDKs">
             <!-- Android.sdk -->
@@ -156,6 +159,14 @@
       </Component>
     </ComponentGroup>
 
+    <ComponentGroup Id="DS2">
+      <?if $(ANDROID_INCLUDE_DS2) == true ?>
+        <Component Directory="Android_Library_ARCH_bin">
+          <File Source="$(PLATFORM_ROOT)\Developer\Library\$(ArchTriple)\bin\ds2" />
+        </Component>
+      <?endif?>
+    </ComponentGroup>
+
     <ComponentGroup Id="SwiftRemoteMirror" Directory="AndroidSDK_usr_include_swift_SwiftRemoteMirror">
       <Component>
         <File Source="$(SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\MemoryReaderInterface.h" />
@@ -1283,6 +1294,7 @@
       <ComponentGroupRef Id="Registrar" />
       <ComponentGroupRef Id="Configuration" />
       <ComponentGroupRef Id="SwiftShims" />
+      <ComponentGroupRef Id="DS2" />
 
       <ComponentGroupRef Id="VersionedDirectoryCleanup" />
     </Feature>