Updated macros to handle ANDROID clearer

Author: H-G-Hristov

libcxx/include/__config

@@ -1217,14 +1217,17 @@ typedef __char32_t char32_t;
 
 // TODO(LLVM 22): Remove this macro once LLVM19 support ends.
 #  if __has_builtin(__reference_constructs_from_temporary) ||                                                          \
-      (defined(_LIBCPP_CLANG_VER) && (_LIBCPP_CLANG_VER >= 1900))
+      (defined(_LIBCPP_CLANG_VER) &&                                                                                   \
+       ((!defined(__ANDROID__) && _LIBCPP_CLANG_VER >= 1901) || (defined(__ANDROID__) && _LIBCPP_CLANG_VER >= 1900)))
 #    define _LIBCPP_HAS_REFERENCE_CONSTRUCTS_FROM_TEMPORARY 1
 #  else
 #    define _LIBCPP_HAS_REFERENCE_CONSTRUCTS_FROM_TEMPORARY 0
 #  endif
 
 // TODO(LLVM 22): Remove this macro once LLVM19 support ends.
-#  if __has_builtin(__reference_converts_from_temporary) || (defined(_LIBCPP_CLANG_VER) && (_LIBCPP_CLANG_VER >= 1901))
+#  if __has_builtin(__reference_converts_from_temporary) ||                                                            \
+      (defined(_LIBCPP_CLANG_VER) &&                                                                                   \
+       ((!defined(__ANDROID__) && _LIBCPP_CLANG_VER >= 1901) || (defined(__ANDROID__) && _LIBCPP_CLANG_VER >= 2000)))
 #    define _LIBCPP_HAS_REFERENCE_CONVERTS_FROM_TEMPORARY 1
 #  else
 #    define _LIBCPP_HAS_REFERENCE_CONVERTS_FROM_TEMPORARY 0