[Android] Guard some NDK workarounds by major version.

src/common/android/include/sys/user.h

Index: src/common/android/include/sys/user.h
diff --git a/src/common/android/include/sys/user.h b/src/common/android/include/sys/user.h
index 5f0360475dcfaf5343f470ba80e1075e3d90d533..1eb02a57d2cc512b76e5ef75139efafd03cca186 100644
--- a/src/common/android/include/sys/user.h
+++ b/src/common/android/include/sys/user.h
@@ -34,12 +34,20 @@
 // glibc) and therefore avoid doing otherwise awkward #ifdefs in the code.
 // The following quirks are currently handled by this file:
 // - i386: Use the Android NDK but alias user_fxsr_struct > user_fpxregs_struct.
-// - aarch64: Add missing user_regs_struct and user_fpsimd_struct structs.
+// - aarch64:
+//   - NDK r10: Add missing user_regs_struct and user_fpsimd_struct structs.
+//   - NDK r11+: Add missing <stdint.h> include
 // - Other platforms: Just use the Android NDK unchanged.
 
 // TODO(primiano): remove these changes after Chromium has stably rolled to
 // an NDK with the appropriate fixes.
 
+#if defined(ANDROID_NDK_MAJOR_VERSION) && ANDROID_NDK_MAJOR_VERSION > 10
+#ifdef __aarch64__
+#include <stdint.h>
+#endif  // __aarch64__
+#endif  // defined(ANDROID_NDK_MAJOR_VERSION) && ANDROID_NDK_MAJOR_VERSION > 10
+
 #include_next <sys/user.h>
 
 #ifdef __i386__
@@ -52,6 +60,7 @@ typedef struct user_fxsr_struct user_fpxregs_struct;
 #endif  // __cplusplus
 #endif  // __i386__
 
+#if !defined(ANDROID_NDK_MAJOR_VERSION) || ANDROID_NDK_MAJOR_VERSION == 10
 #ifdef __aarch64__
 #ifdef __cplusplus
 extern "C" {
@@ -71,5 +80,6 @@ struct user_fpsimd_struct {
 }  // extern "C"
 #endif  // __cplusplus
 #endif  // __aarch64__
+#endif  // defined(ANDROID_NDK_VERSION) && ANDROID_NDK_MAJOR_VERSION == 10
 
 #endif  // GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_SYS_USER_H