Snap for 4593582 from 5a5968849d605c124aa30f964a250c3485338d4a to pi-release

Change-Id: I9e0db753ec1b8208764cf0f07c688a05866bd790
diff --git a/r16/sources/cxx-stl/llvm-libc++/include/support/android/locale_bionic.h b/r16/sources/cxx-stl/llvm-libc++/include/support/android/locale_bionic.h
index 482e234..081035d 100644
--- a/r16/sources/cxx-stl/llvm-libc++/include/support/android/locale_bionic.h
+++ b/r16/sources/cxx-stl/llvm-libc++/include/support/android/locale_bionic.h
@@ -25,7 +25,6 @@
 #endif
 
 #include <support/xlocale/__posix_l_fallback.h>
-#include <support/xlocale/__strtonum_fallback.h>
 
 #endif // defined(__BIONIC__)
 #endif // _LIBCPP_SUPPORT_ANDROID_LOCALE_BIONIC_H