diff --git a/include/flatbuffers/base.h b/include/flatbuffers/base.h
index 84cb0a7d16d..834f2d29b15 100644
--- a/include/flatbuffers/base.h
+++ b/include/flatbuffers/base.h
@@ -267,11 +267,11 @@ namespace flatbuffers {
 
 #ifndef FLATBUFFERS_LOCALE_INDEPENDENT
   // Enable locale independent functions {strtof_l, strtod_l,strtoll_l,
-  // strtoull_l}.
+  // strtoull_l} on platforms that support them.
   #if (defined(_MSC_VER) && _MSC_VER >= 1800) || \
-      (defined(__ANDROID_API__) && __ANDROID_API__>= 21) || \
+      (defined(__ANDROID__) && defined(__ANDROID_API__) && __ANDROID_API__>= 26) || \
       (defined(_XOPEN_VERSION) && (_XOPEN_VERSION >= 700)) && \
-        (!defined(__Fuchsia__) && !defined(__ANDROID_API__))
+      !defined(__Fuchsia__)
     #define FLATBUFFERS_LOCALE_INDEPENDENT 1
   #else
     #define FLATBUFFERS_LOCALE_INDEPENDENT 0