[core][android][darwin] Move number format to i18n

platform/android/src/i18n/number_format.cpp

@@ -1,11 +1,10 @@
-#include <mbgl/style/expression/collator.hpp>
+#include <mbgl/i18n/number_format.hpp>
 #include <mbgl/text/language_tag.hpp>
-#include <mbgl/util/platform.hpp>
 
 #include <jni/jni.hpp>
 
 #include "../attach_env.hpp"
-#include "format_number_jni.hpp"
+#include "number_format_jni.hpp"
 
 namespace mbgl {
 namespace android {

platform/android/src/i18n/number_format_jni.hpp

@@ -2,7 +2,7 @@
 
 #include <jni/jni.hpp>
 
-#include "../i18n/collator_jni.hpp"
+#include "collator_jni.hpp"
 
 /*
     android::NumberFormat is the JNI wrapper

platform/android/src/jni_native.cpp

@@ -51,9 +51,9 @@
 #include "snapshotter/map_snapshot.hpp"
 #endif
 #include "i18n/collator_jni.hpp"
+#include "i18n/number_format_jni.hpp"
 #include "logger.hpp"
 #include "text/local_glyph_rasterizer_jni.hpp"
-#include "text/format_number_jni.hpp"
 
 namespace mbgl {
 namespace android {