Fix post-rebase issues and conflicts

Author: grendello

src/native/pinvoke-override/common.cc

@@ -4,7 +4,11 @@ using namespace xamarin::android;
 
 PinvokeOverride::pinvoke_library_map PinvokeOverride::other_pinvoke_map (PinvokeOverride::LIBRARY_MAP_INITIAL_BUCKET_COUNT);
 <<<<<<< HEAD
+<<<<<<< HEAD
 xamarin::android::mutex PinvokeOverride::pinvoke_map_write_lock;
 =======
 std::mutex PinvokeOverride::pinvoke_map_write_lock;
 >>>>>>> 13ba4b152 (Let's see what breaks)
+=======
+xamarin::android::mutex PinvokeOverride::pinvoke_map_write_lock;
+>>>>>>> da87011a5 (Fix post-rebase issues and conflicts)

src/native/pinvoke-override/pinvoke-override-api.hh

@@ -78,7 +78,11 @@ namespace xamarin::android {
 		static void* monodroid_pinvoke_override (const char *library_name, const char *entrypoint_name);
 
 	private:
+<<<<<<< HEAD
 		static xamarin::android::mutex  pinvoke_map_write_lock;
+=======
+		static xamarin::android::mutex pinvoke_map_write_lock;
+>>>>>>> da87011a5 (Fix post-rebase issues and conflicts)
 		static pinvoke_library_map    other_pinvoke_map;
 
 #if defined(PRECOMPILED)

src/native/runtime-base/monodroid-dl.hh

@@ -19,11 +19,15 @@ namespace xamarin::android::internal
 {
 	class MonodroidDl
 	{
+<<<<<<< HEAD
 <<<<<<< HEAD
 		static inline xamarin::android::mutex   dso_handle_write_lock;
 =======
 		static inline std::mutex   dso_handle_write_lock;
 >>>>>>> 0c9fc0626 (Prepare for new p/invoke code, step #2)
+=======
+		static inline xamarin::android::mutex   dso_handle_write_lock;
+>>>>>>> da87011a5 (Fix post-rebase issues and conflicts)
 
 		static unsigned int convert_dl_flags (int flags) noexcept
 		{