Bring back aar in nupkg

This reverts db74a74

Which should be fixed by 15311bc which causes the .targets file to be properly imported for transitive nuget dependencies of a project.

Author: Redth

source/AndroidSupportProject.cshtml

@@ -70,15 +70,6 @@
   </ItemGroup>
   }
 
-  <ItemGroup>
-    @foreach (var art in @Model.MavenArtifacts) {
-      if (art.MavenArtifactPackaging == "aar") {
-    <LibraryProjectZip Include="..\..\externals\@(art.MavenGroupId).@(art.MavenArtifactId).aar" />
-      }
-    }   
-  </ItemGroup>
-
-
   <ItemGroup>
     <Folder Include="Additions\" />
     <Folder Include="Jars\" />
@@ -102,7 +93,7 @@
 
   <ItemGroup>
     @foreach (var art in @Model.MavenArtifacts) {
-      if (1==2 && art.MavenArtifactPackaging == "aar") {
+      if (art.MavenArtifactPackaging == "aar") {
     <None Include="..\..\externals\@(art.MavenGroupId).@(art.MavenArtifactId).aar" Pack="True" PackagePath="aar\" />
       }
     }   

source/AndroidSupportTargets.cshtml

@@ -27,7 +27,13 @@
     }
   </ItemGroup>
   }
-
+  <ItemGroup>
+    @foreach (var art in @Model.MavenArtifacts) {
+      if (art.MavenArtifactPackaging == "aar") {
+    <AndroidAarLibrary Include="$(MSBuildThisFileDirectory)..\..\aar\@(art.MavenGroupId).@(art.MavenArtifactId).aar" />
+      }
+    }   
+  </ItemGroup>
 @{
   string mergeTargets = Path.Combine(Model.Config.BasePath, "source", Model.MavenGroupId, Model.Name, "merge.targets");
   if (File.Exists(mergeTargets)) {