resolve merge: xamarin app conflicts

xamarin/src/ConnectedDevices.Xamarin.Droid.Core/ConnectedDevices.Xamarin.Droid.Core.csproj

@@ -14,8 +14,8 @@
     <FileAlignment>512</FileAlignment>
     <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
     <TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
-    <AndroidClassParser>jar2xml</AndroidClassParser>
-    <AndroidCodegenTarget>XamarinAndroid</AndroidCodegenTarget>
+    <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

xamarin/src/ConnectedDevices.Xamarin.Droid.Core/Transforms/Metadata.xml

@@ -6,4 +6,5 @@
   This sample removes the method: android.support.v4.content.CursorLoader.loadInBackground:
   <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='CursorLoader']/method[@name='loadInBackground']" />
   -->
+  <attr path="/api/package[@name='com.microsoft.cdp']" name="managedName">Microsoft.ConnectedDevices.Core</attr>
 </metadata>