Merge branch 'xamarin-mobile-bindings' into update-m58

# Conflicts:
#	include/c/sk_types.h
#	src/c/sk_enums.cpp
#	src/c/sk_structs.cpp

diff --cc gn/core.gni
Simple merge

diff --cc include/c/sk_types.h
Simple merge

diff --cc src/c/sk_enums.cpp
index 5bd416d,943061d..3fd6d1b
--- 1/src/c/sk_enums.cpp
--- 2/src/c/sk_enums.cpp
+++ b/src/c/sk_enums.cpp
@@@ -11,7 -11,7 +11,8 @@@
  #include "SkBlurMaskFilter.h"
  
  #if SK_SUPPORT_GPU
+ #include "GrTypes.h"
 +#include "GrContextOptions.h"
  #endif
  
  #if __cplusplus >= 199711L