Updating changes for Android packaging projects with VS2015 RC.

Author: stgates

Release/tests/common/TestRunner/vs14.android/TestRunner.android.NativeActivity/TestRunner.android.NativeActivity.vcxproj

@@ -255,7 +255,6 @@
     <Import Project="$(PackagesRoot)\boost_chrono-android.1.55.0.0\build\native\boost_chrono-android.targets" Condition="Exists('$(PackagesRoot)\boost_chrono-android.1.55.0.0\build\native\boost_chrono-android.targets')" />
     <Import Project="$(PackagesRoot)\boost_date_time-android.1.55.0.0\build\native\boost_date_time-android.targets" Condition="Exists('$(PackagesRoot)\boost_date_time-android.1.55.0.0\build\native\boost_date_time-android.targets')" />
     <Import Project="$(PackagesRoot)\boost_filesystem-android.1.55.0.0\build\native\boost_filesystem-android.targets" Condition="Exists('$(PackagesRoot)\boost_filesystem-android.1.55.0.0\build\native\boost_filesystem-android.targets')" />
-    <Import Project="$(PackagesRoot)\libiconv-android.1.13.1.0\build\native\libiconv-android.targets" Condition="Exists('$(PackagesRoot)\libiconv-android.1.13.1.0\build\native\libiconv-android.targets')" />
     <Import Project="$(PackagesRoot)\boost_locale-android.1.55.0.0\build\native\boost_locale-android.targets" Condition="Exists('$(PackagesRoot)\boost_locale-android.1.55.0.0\build\native\boost_locale-android.targets')" />
     <Import Project="$(PackagesRoot)\boost_system-android.1.55.0.0\build\native\boost_system-android.targets" Condition="Exists('$(PackagesRoot)\boost_system-android.1.55.0.0\build\native\boost_system-android.targets')" />
     <Import Project="$(PackagesRoot)\boost_thread-android.1.55.0.0\build\native\boost_thread-android.targets" Condition="Exists('$(PackagesRoot)\boost_thread-android.1.55.0.0\build\native\boost_thread-android.targets')" />
@@ -271,7 +270,6 @@
     <Error Condition="!Exists('$(PackagesRoot)\boost_chrono-android.1.55.0.0\build\native\boost_chrono-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_chrono-android.1.55.0.0\build\native\boost_chrono-android.targets'))" />
     <Error Condition="!Exists('$(PackagesRoot)\boost_date_time-android.1.55.0.0\build\native\boost_date_time-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_date_time-android.1.55.0.0\build\native\boost_date_time-android.targets'))" />
     <Error Condition="!Exists('$(PackagesRoot)\boost_filesystem-android.1.55.0.0\build\native\boost_filesystem-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_filesystem-android.1.55.0.0\build\native\boost_filesystem-android.targets'))" />
-    <Error Condition="!Exists('$(PackagesRoot)\libiconv-android.1.13.1.0\build\native\libiconv-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\libiconv-android.1.13.1.0\build\native\libiconv-android.targets'))" />
     <Error Condition="!Exists('$(PackagesRoot)\boost_locale-android.1.55.0.0\build\native\boost_locale-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_locale-android.1.55.0.0\build\native\boost_locale-android.targets'))" />
     <Error Condition="!Exists('$(PackagesRoot)\boost_system-android.1.55.0.0\build\native\boost_system-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_system-android.1.55.0.0\build\native\boost_system-android.targets'))" />
     <Error Condition="!Exists('$(PackagesRoot)\boost_thread-android.1.55.0.0\build\native\boost_thread-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_thread-android.1.55.0.0\build\native\boost_thread-android.targets'))" />

Release/tests/common/TestRunner/vs14.android/TestRunner.android.Packaging/TestRunner.android.Packaging.androidproj

@@ -24,7 +24,7 @@
     <ProjectVersion>1.0</ProjectVersion>
     <ProjectGuid>{7cf3c460-3486-4106-80cd-eb802dfef373}</ProjectGuid>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\AndroidPackaging\Android.Default.props" />
+  <Import Project="$(AndroidTargetsPath)\Android.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
@@ -37,7 +37,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\AndroidPackaging\Android.props" />
+  <Import Project="$(AndroidTargetsPath)\Android.props" />
   <ImportGroup Label="ExtensionSettings" />
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
@@ -73,7 +73,7 @@
       <Project>{d1060d0a-a10e-444d-9f6b-9676ea453f9a}</Project>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\AndroidPackaging\Android.targets" />
+  <Import Project="$(AndroidTargetsPath)\Android.targets" />
   <ImportGroup Label="ExtensionTargets" />
 
   <!-- For some reason build fails if the following directory doesn't exist on command line build -->