Fix post-rebase issues and conflicts

Author: grendello

src/native/pinvoke-override/common.cc

@@ -3,4 +3,4 @@
 using namespace xamarin::android;
 
 PinvokeOverride::pinvoke_library_map PinvokeOverride::other_pinvoke_map (PinvokeOverride::LIBRARY_MAP_INITIAL_BUCKET_COUNT);
-std::mutex PinvokeOverride::pinvoke_map_write_lock;
+xamarin::android::mutex PinvokeOverride::pinvoke_map_write_lock;

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

@@ -78,7 +78,7 @@ namespace xamarin::android {
 		static void* monodroid_pinvoke_override (const char *library_name, const char *entrypoint_name);
 
 	private:
-		static std::mutex             pinvoke_map_write_lock;
+		static xamarin::android::mutex pinvoke_map_write_lock;
 		static pinvoke_library_map    other_pinvoke_map;
 
 #if defined(PRECOMPILED)

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

@@ -19,7 +19,7 @@ namespace xamarin::android::internal
 {
 	class MonodroidDl
 	{
-		static inline std::mutex   dso_handle_write_lock;
+		static inline xamarin::android::mutex   dso_handle_write_lock;
 
 		static unsigned int convert_dl_flags (int flags) noexcept
 		{