diff --git a/ReactAndroid/Android-prebuilt.mk b/ReactAndroid/Android-prebuilt.mk
index 726a8a1d025..d7d0d593e95 100644
--- a/ReactAndroid/Android-prebuilt.mk
+++ b/ReactAndroid/Android-prebuilt.mk
@@ -29,10 +29,10 @@ LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libfb.so
 LOCAL_EXPORT_C_INCLUDES := $(FIRST_PARTY_NDK_DIR)/fb/include
 include $(PREBUILT_SHARED_LIBRARY)
 
-# folly_json
+# folly_runtime
 include $(CLEAR_VARS)
-LOCAL_MODULE := folly_json
-LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libfolly_json.so
+LOCAL_MODULE := folly_runtime
+LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libfolly_runtime.so
 LOCAL_EXPORT_C_INCLUDES := \
   $(THIRD_PARTY_NDK_DIR)/boost/boost_1_63_0 \
   $(THIRD_PARTY_NDK_DIR)/double-conversion \
@@ -49,13 +49,6 @@ LOCAL_CFLAGS += $(FOLLY_FLAGS)
 LOCAL_EXPORT_CPPFLAGS := $(FOLLY_FLAGS)
 include $(PREBUILT_SHARED_LIBRARY)
 
-# folly_futures
-include $(CLEAR_VARS)
-LOCAL_MODULE := folly_futures
-LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libfolly_futures.so
-LOCAL_SHARED_LIBRARIES := liblibfolly_json
-include $(PREBUILT_SHARED_LIBRARY)
-
 # glog
 include $(CLEAR_VARS)
 LOCAL_MODULE := glog
@@ -87,7 +80,7 @@ LOCAL_EXPORT_C_INCLUDES := \
   $(REACT_COMMON_DIR)/jsi \
   $(REACT_COMMON_DIR)/react/nativemodule/core \
   $(REACT_COMMON_DIR)/react/nativemodule/core/platform/android
-LOCAL_SHARED_LIBRARIES := libfolly_json
+LOCAL_SHARED_LIBRARIES := libfolly_runtime
 include $(PREBUILT_SHARED_LIBRARY)
 
 # turbomodulejsijni
@@ -121,7 +114,7 @@ LOCAL_MODULE := react_debug
 LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libreact_debug.so
 LOCAL_EXPORT_C_INCLUDES := \
   $(REACT_COMMON_DIR)/react/debug
-LOCAL_SHARED_LIBRARIES := libfolly_json
+LOCAL_SHARED_LIBRARIES := libfolly_runtime
 include $(PREBUILT_SHARED_LIBRARY)
 
 # react_render_graphics
diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/Android.mk b/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/Android.mk
index a104743b82e..32f5844a453 100644
--- a/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/Android.mk
+++ b/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/Android.mk
@@ -21,7 +21,7 @@ LOCAL_STATIC_LIBRARIES := libjsireact
 LOCAL_SHARED_LIBRARIES := \
   libfb \
   libfbjni \
-  libfolly_json \
+  libfolly_runtime \
   libhermes \
   libjsi \
   libreactnativejni
diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/Android.mk b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/Android.mk
index 32679252689..66b791f766d 100644
--- a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/Android.mk
+++ b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/Android.mk
@@ -22,7 +22,7 @@ ifeq ($(APP_OPTIM),debug)
   LOCAL_SHARED_LIBRARIES := \
     libfb \
     libfbjni \
-    libfolly_json \
+    libfolly_runtime \
     libhermes \
     libjsi \
     libreactnativejni
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/Android.mk
index 170afa13b10..b56517b8ff0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/Android.mk
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/Android.mk
@@ -14,8 +14,6 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/react/common/mapbuffer/*.cpp)
 LOCAL_SHARED_LIBRARIES := \
   libfb \
   libfbjni \
-  libfolly_futures \
-  libfolly_json \
   libglog \
   libglog_init \
   libreact_debug \
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk
index 90efbec92e8..4d3b97aee7e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk
@@ -15,8 +15,7 @@ LOCAL_SHARED_LIBRARIES := \
   libbutter \
   libfb \
   libfbjni \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog \
   libglog_init \
   libjsi \
diff --git a/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/Android.mk
index 0bba11802b3..bb426b20829 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/Android.mk
+++ b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/Android.mk
@@ -19,7 +19,7 @@ LOCAL_STATIC_LIBRARIES :=  libjsireact jscruntime
 LOCAL_SHARED_LIBRARIES := \
   libfb \
   libfbjni \
-  libfolly_json \
+  libfolly_runtime \
   libjsi \
   libreactnativejni
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/Android.mk
index 76e0bd7e22e..df00d67b191 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/Android.mk
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/Android.mk
@@ -19,7 +19,7 @@ LOCAL_STATIC_LIBRARIES :=  libjsireact
 LOCAL_SHARED_LIBRARIES := \
   libfb \
   libfbjni \
-  libfolly_json \
+  libfolly_runtime \
   libjsi \
   libreactnativejni
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/Android.mk
index fbf8752c816..a685bf3a300 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/Android.mk
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/Android.mk
@@ -14,8 +14,6 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 LOCAL_SHARED_LIBRARIES := \
   libfb \
   libfbjni \
-  libfolly_futures \
-  libfolly_json \
   libglog \
   libglog_init \
   librrc_native \
diff --git a/ReactAndroid/src/main/jni/react/jni/Android.mk b/ReactAndroid/src/main/jni/react/jni/Android.mk
index cb1c95789d7..69b7e01d128 100644
--- a/ReactAndroid/src/main/jni/react/jni/Android.mk
+++ b/ReactAndroid/src/main/jni/react/jni/Android.mk
@@ -30,7 +30,7 @@ LOCAL_LDLIBS += -landroid
 LOCAL_SHARED_LIBRARIES := \
   libfb \
   libfbjni \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libreact_render_runtimescheduler \
   libruntimeexecutor \
@@ -87,7 +87,7 @@ LOCAL_LDLIBS += -landroid
 LOCAL_SHARED_LIBRARIES := \
   libfb \
   libfbjni \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libreact_render_runtimescheduler \
   libreactnativeutilsjni \
diff --git a/ReactAndroid/src/main/jni/third-party/folly/Android.mk b/ReactAndroid/src/main/jni/third-party/folly/Android.mk
index dacf2118dc6..59b721767c1 100644
--- a/ReactAndroid/src/main/jni/third-party/folly/Android.mk
+++ b/ReactAndroid/src/main/jni/third-party/folly/Android.mk
@@ -1,36 +1,4 @@
 LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
-  folly/json.cpp \
-  folly/Unicode.cpp \
-  folly/Conv.cpp \
-  folly/Demangle.cpp \
-  folly/memory/detail/MallocImpl.cpp \
-  folly/String.cpp \
-  folly/dynamic.cpp \
-  folly/FileUtil.cpp \
-  folly/Format.cpp \
-  folly/net/NetOps.cpp \
-  folly/json_pointer.cpp \
-  folly/lang/CString.cpp \
-  folly/lang/SafeAssert.cpp \
-  folly/detail/UniqueInstance.cpp \
-  folly/hash/SpookyHashV2.cpp \
-  folly/container/detail/F14Table.cpp \
-  folly/ScopeGuard.cpp \
-  folly/portability/SysUio.cpp \
-  folly/lang/ToAscii.cpp
-
-ifeq ($(APP_OPTIM),debug)
-  LOCAL_SRC_FILES += \
-    folly/lang/Assume.cpp
-endif
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
-
-LOCAL_CFLAGS += -fexceptions -fno-omit-frame-pointer -frtti -Wno-sign-compare
 
 FOLLY_FLAGS := \
   -DFOLLY_NO_CONFIG=1 \
@@ -44,14 +12,51 @@ FOLLY_FLAGS := \
 # NDK uses GNU style stderror_r() after API 23.
 FOLLY_FLAGS += -DFOLLY_HAVE_XSI_STRERROR_R=1
 
-LOCAL_CFLAGS += $(FOLLY_FLAGS)
+include $(CLEAR_VARS)
 
+LOCAL_SRC_FILES := \
+  folly/SharedMutex.cpp \
+  folly/concurrency/CacheLocality.cpp \
+  folly/detail/Futex.cpp \
+  folly/lang/SafeAssert.cpp \
+  folly/lang/ToAscii.cpp \
+  folly/synchronization/ParkingLot.cpp \
+  folly/system/ThreadId.cpp \
+  folly/system/ThreadName.cpp \
+  folly/json.cpp \
+  folly/Unicode.cpp \
+  folly/Conv.cpp \
+  folly/Demangle.cpp \
+  folly/memory/detail/MallocImpl.cpp \
+  folly/String.cpp \
+  folly/dynamic.cpp \
+  folly/FileUtil.cpp \
+  folly/Format.cpp \
+  folly/net/NetOps.cpp \
+  folly/json_pointer.cpp \
+  folly/lang/CString.cpp \
+  folly/detail/UniqueInstance.cpp \
+  folly/hash/SpookyHashV2.cpp \
+  folly/container/detail/F14Table.cpp \
+  folly/ScopeGuard.cpp \
+  folly/portability/SysUio.cpp
+
+ifeq ($(APP_OPTIM),debug)
+  LOCAL_SRC_FILES += \
+    folly/lang/Assume.cpp
+endif
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+
+LOCAL_CFLAGS += -fexceptions -fno-omit-frame-pointer -frtti -Wno-sign-compare -Wno-unused-variable
+LOCAL_CFLAGS += $(FOLLY_FLAGS)
 LOCAL_EXPORT_CPPFLAGS := $(FOLLY_FLAGS)
 
-LOCAL_MODULE := libfolly_json
+LOCAL_MODULE := folly_runtime
 
-LOCAL_SHARED_LIBRARIES := libglog libdouble-conversion
-LOCAL_STATIC_LIBRARIES := libboost libfmt
+LOCAL_SHARED_LIBRARIES := libglog
+LOCAL_STATIC_LIBRARIES := libboost libfmt libdouble-conversion
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -61,13 +66,11 @@ LOCAL_SRC_FILES := \
   folly/ExceptionWrapper.cpp \
   folly/ExceptionString.cpp \
   folly/Executor.cpp \
-  folly/SharedMutex.cpp \
   folly/Singleton.cpp \
   folly/Try.cpp \
   folly/concurrency/CacheLocality.cpp \
   folly/detail/AsyncTrace.cpp \
   folly/detail/AtFork.cpp \
-  folly/detail/Futex.cpp \
   folly/detail/MemoryIdler.cpp \
   folly/detail/SingletonStackTrace.cpp \
   folly/detail/StaticSingletonManager.cpp \
@@ -97,12 +100,9 @@ LOCAL_SRC_FILES := \
   folly/portability/SysMembarrier.cpp \
   folly/synchronization/AsymmetricMemoryBarrier.cpp \
   folly/synchronization/Hazptr.cpp \
-  folly/synchronization/ParkingLot.cpp \
   folly/synchronization/WaitOptions.cpp \
   folly/synchronization/detail/Sleeper.cpp \
-  folly/system/Pid.cpp \
-  folly/system/ThreadId.cpp \
-  folly/system/ThreadName.cpp
+  folly/system/Pid.cpp
 
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
@@ -116,10 +116,10 @@ LOCAL_EXPORT_CPPFLAGS := $(FOLLY_FLAGS)
 
 LOCAL_MODULE := libfolly_futures
 
-LOCAL_SHARED_LIBRARIES := libglog libdouble-conversion libfolly_json
-LOCAL_STATIC_LIBRARIES := libboost libevent libfmt
+LOCAL_SHARED_LIBRARIES := libglog libfolly_runtime
+LOCAL_STATIC_LIBRARIES := libboost libevent libfmt libdouble-conversion
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
 
 $(call import-module,libevent)
 $(call import-module,glog)
diff --git a/ReactCommon/butter/Android.mk b/ReactCommon/butter/Android.mk
index f2bbd9a7dc9..cda21ea7506 100644
--- a/ReactCommon/butter/Android.mk
+++ b/ReactCommon/butter/Android.mk
@@ -19,8 +19,6 @@ LOCAL_CFLAGS := \
 
 LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
-LOCAL_STATIC_LIBRARIES :=
-
 LOCAL_SHARED_LIBRARIES := glog
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/ReactCommon/cxxreact/Android.mk b/ReactCommon/cxxreact/Android.mk
index c6595e435d1..4ff838da45a 100644
--- a/ReactCommon/cxxreact/Android.mk
+++ b/ReactCommon/cxxreact/Android.mk
@@ -28,7 +28,7 @@ LOCAL_STATIC_LIBRARIES := \
 LOCAL_SHARED_LIBRARIES := \
   glog \
   jsinspector \
-  libfolly_json \
+  libfolly_runtime \
   libruntimeexecutor \
   logger
 
diff --git a/ReactCommon/hermes/inspector/Android.mk b/ReactCommon/hermes/inspector/Android.mk
index 824ab7dfd46..a5e95b0f05f 100644
--- a/ReactCommon/hermes/inspector/Android.mk
+++ b/ReactCommon/hermes/inspector/Android.mk
@@ -24,10 +24,12 @@ LOCAL_SHARED_LIBRARIES := \
   jsinspector \
   libfb \
   libfbjni \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog \
   libhermes \
   libjsi
 
+LOCAL_STATIC_LIBRARIES := \
+  libfolly_futures
+
 include $(BUILD_STATIC_LIBRARY)
diff --git a/ReactCommon/jsi/Android.mk b/ReactCommon/jsi/Android.mk
index ee42537e701..f75a528e746 100644
--- a/ReactCommon/jsi/Android.mk
+++ b/ReactCommon/jsi/Android.mk
@@ -15,7 +15,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
 LOCAL_CFLAGS := -fexceptions -frtti -O3
-LOCAL_SHARED_LIBRARIES := libfolly_json glog
+LOCAL_SHARED_LIBRARIES := libfolly_runtime glog
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -30,7 +30,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
 LOCAL_CFLAGS := -fexceptions -frtti -O3
-LOCAL_SHARED_LIBRARIES := libfolly_json libjsc glog
+LOCAL_SHARED_LIBRARIES := libfolly_runtime libjsc glog
 
 # TODO: Remove this flag when ready.
 # Android has this enabled by default, but the flag is still needed for iOS.
diff --git a/ReactCommon/jsiexecutor/Android.mk b/ReactCommon/jsiexecutor/Android.mk
index 2c523fcbe28..9749ca7a36f 100644
--- a/ReactCommon/jsiexecutor/Android.mk
+++ b/ReactCommon/jsiexecutor/Android.mk
@@ -17,6 +17,6 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
 LOCAL_CFLAGS := -fexceptions -frtti -O3
 
 LOCAL_STATIC_LIBRARIES := reactnative reactperflogger
-LOCAL_SHARED_LIBRARIES := libfolly_json glog libjsi
+LOCAL_SHARED_LIBRARIES := libfolly_runtime glog libjsi
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/ReactCommon/react/debug/Android.mk b/ReactCommon/react/debug/Android.mk
index 26354629e27..39be4fd41f7 100644
--- a/ReactCommon/react/debug/Android.mk
+++ b/ReactCommon/react/debug/Android.mk
@@ -15,7 +15,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 
-LOCAL_SHARED_LIBRARIES := libfolly_json
+LOCAL_SHARED_LIBRARIES := libfolly_runtime
 
 LOCAL_LDLIBS := -llog
 
diff --git a/ReactCommon/react/nativemodule/core/Android.mk b/ReactCommon/react/nativemodule/core/Android.mk
index 8689f2bfe11..677bfec76d3 100644
--- a/ReactCommon/react/nativemodule/core/Android.mk
+++ b/ReactCommon/react/nativemodule/core/Android.mk
@@ -17,7 +17,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../ $(LOCAL_PATH) $(LOCAL_PATH)/p
 
 LOCAL_SHARED_LIBRARIES := \
   libfbjni \
-  libfolly_json \
+  libfolly_runtime \
   libjsi \
   libreact_debug \
   libreactnativejni
diff --git a/ReactCommon/react/renderer/animations/Android.mk b/ReactCommon/react/renderer/animations/Android.mk
index ea096c31322..ce6a627e1b0 100644
--- a/ReactCommon/react/renderer/animations/Android.mk
+++ b/ReactCommon/react/renderer/animations/Android.mk
@@ -23,8 +23,7 @@ LOCAL_STATIC_LIBRARIES :=
 
 LOCAL_SHARED_LIBRARIES := \
   glog \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libjsi \
   libreact_debug \
diff --git a/ReactCommon/react/renderer/attributedstring/Android.mk b/ReactCommon/react/renderer/attributedstring/Android.mk
index aa1c13ff3fc..eddbaa9bcd6 100644
--- a/ReactCommon/react/renderer/attributedstring/Android.mk
+++ b/ReactCommon/react/renderer/attributedstring/Android.mk
@@ -24,8 +24,7 @@ LOCAL_STATIC_LIBRARIES :=
 LOCAL_SHARED_LIBRARIES := \
   glog \
   libbutter \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libreact_debug \
   libreact_render_core \
diff --git a/ReactCommon/react/renderer/componentregistry/Android.mk b/ReactCommon/react/renderer/componentregistry/Android.mk
index 7e8948d14ec..3d4a1379eb4 100644
--- a/ReactCommon/react/renderer/componentregistry/Android.mk
+++ b/ReactCommon/react/renderer/componentregistry/Android.mk
@@ -16,8 +16,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 
 LOCAL_SHARED_LIBRARIES := \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libjsi \
   libreact_debug \
@@ -25,6 +24,7 @@ LOCAL_SHARED_LIBRARIES := \
   libreact_render_debug \
   libreact_utils
 
+
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
diff --git a/ReactCommon/react/renderer/componentregistry/native/Android.mk b/ReactCommon/react/renderer/componentregistry/native/Android.mk
index 29fb69f5a9a..3e469cf20f1 100644
--- a/ReactCommon/react/renderer/componentregistry/native/Android.mk
+++ b/ReactCommon/react/renderer/componentregistry/native/Android.mk
@@ -16,8 +16,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../
 
 LOCAL_SHARED_LIBRARIES := \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libjsi \
   libreact_debug \
diff --git a/ReactCommon/react/renderer/components/image/Android.mk b/ReactCommon/react/renderer/components/image/Android.mk
index ddac1742315..220412cd6ac 100644
--- a/ReactCommon/react/renderer/components/image/Android.mk
+++ b/ReactCommon/react/renderer/components/image/Android.mk
@@ -23,7 +23,7 @@ LOCAL_STATIC_LIBRARIES :=
 
 LOCAL_SHARED_LIBRARIES := \
   glog \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libjsi \
   libreact_debug \
diff --git a/ReactCommon/react/renderer/components/modal/Android.mk b/ReactCommon/react/renderer/components/modal/Android.mk
index 62f84467af7..7b96f9b9fbf 100644
--- a/ReactCommon/react/renderer/components/modal/Android.mk
+++ b/ReactCommon/react/renderer/components/modal/Android.mk
@@ -23,7 +23,7 @@ LOCAL_STATIC_LIBRARIES :=
 
 LOCAL_SHARED_LIBRARIES := \
   glog \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libreact_codegen_rncore \
   libreact_render_componentregistry \
diff --git a/ReactCommon/react/renderer/components/progressbar/Android.mk b/ReactCommon/react/renderer/components/progressbar/Android.mk
index dcbf866581b..82fa81563d2 100644
--- a/ReactCommon/react/renderer/components/progressbar/Android.mk
+++ b/ReactCommon/react/renderer/components/progressbar/Android.mk
@@ -24,8 +24,7 @@ LOCAL_STATIC_LIBRARIES :=
 LOCAL_SHARED_LIBRARIES := \
   glog \
   libfbjni \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libreact_codegen_rncore \
   libreact_debug \
diff --git a/ReactCommon/react/renderer/components/root/Android.mk b/ReactCommon/react/renderer/components/root/Android.mk
index 2cd25871300..370a6dc576a 100644
--- a/ReactCommon/react/renderer/components/root/Android.mk
+++ b/ReactCommon/react/renderer/components/root/Android.mk
@@ -23,8 +23,7 @@ LOCAL_STATIC_LIBRARIES :=
 
 LOCAL_SHARED_LIBRARIES := \
   glog \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libreact_debug \
   libreact_render_core \
diff --git a/ReactCommon/react/renderer/components/scrollview/Android.mk b/ReactCommon/react/renderer/components/scrollview/Android.mk
index cd9e6624329..f45267d27d7 100644
--- a/ReactCommon/react/renderer/components/scrollview/Android.mk
+++ b/ReactCommon/react/renderer/components/scrollview/Android.mk
@@ -23,8 +23,7 @@ LOCAL_STATIC_LIBRARIES :=
 
 LOCAL_SHARED_LIBRARIES := \
   glog \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libjsi \
   libreact_debug \
diff --git a/ReactCommon/react/renderer/components/slider/Android.mk b/ReactCommon/react/renderer/components/slider/Android.mk
index e4515f601e5..1d533b86f1a 100644
--- a/ReactCommon/react/renderer/components/slider/Android.mk
+++ b/ReactCommon/react/renderer/components/slider/Android.mk
@@ -24,8 +24,7 @@ LOCAL_STATIC_LIBRARIES :=
 LOCAL_SHARED_LIBRARIES := \
   glog \
   libfbjni \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libreact_codegen_rncore \
   libreact_debug \
diff --git a/ReactCommon/react/renderer/components/switch/Android.mk b/ReactCommon/react/renderer/components/switch/Android.mk
index a008d6626e6..e254c06de69 100644
--- a/ReactCommon/react/renderer/components/switch/Android.mk
+++ b/ReactCommon/react/renderer/components/switch/Android.mk
@@ -24,8 +24,7 @@ LOCAL_STATIC_LIBRARIES :=
 LOCAL_SHARED_LIBRARIES := \
   glog \
   libfbjni \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libreact_codegen_rncore \
   libreact_debug \
diff --git a/ReactCommon/react/renderer/components/text/Android.mk b/ReactCommon/react/renderer/components/text/Android.mk
index fb3332e487c..6d604894aaa 100644
--- a/ReactCommon/react/renderer/components/text/Android.mk
+++ b/ReactCommon/react/renderer/components/text/Android.mk
@@ -23,7 +23,7 @@ LOCAL_STATIC_LIBRARIES :=
 
 LOCAL_SHARED_LIBRARIES := \
   glog \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libjsi \
   libreact_debug \
diff --git a/ReactCommon/react/renderer/components/textinput/Android.mk b/ReactCommon/react/renderer/components/textinput/Android.mk
index 81cf1438b99..a8572954c58 100644
--- a/ReactCommon/react/renderer/components/textinput/Android.mk
+++ b/ReactCommon/react/renderer/components/textinput/Android.mk
@@ -23,7 +23,7 @@ LOCAL_STATIC_LIBRARIES :=
 
 LOCAL_SHARED_LIBRARIES := \
   glog \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libjsi \
   libreact_debug \
diff --git a/ReactCommon/react/renderer/components/unimplementedview/Android.mk b/ReactCommon/react/renderer/components/unimplementedview/Android.mk
index d421bd66af0..c6fdcad16ee 100644
--- a/ReactCommon/react/renderer/components/unimplementedview/Android.mk
+++ b/ReactCommon/react/renderer/components/unimplementedview/Android.mk
@@ -23,8 +23,7 @@ LOCAL_STATIC_LIBRARIES :=
 
 LOCAL_SHARED_LIBRARIES := \
   glog \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libjsi \
   libreact_debug \
diff --git a/ReactCommon/react/renderer/components/view/Android.mk b/ReactCommon/react/renderer/components/view/Android.mk
index 07152f97c7f..59d3b01ed9a 100644
--- a/ReactCommon/react/renderer/components/view/Android.mk
+++ b/ReactCommon/react/renderer/components/view/Android.mk
@@ -23,7 +23,7 @@ LOCAL_STATIC_LIBRARIES :=
 
 LOCAL_SHARED_LIBRARIES := \
   glog \
-  libfolly_json \
+  libfolly_runtime \
   libfolly_futures \
   libglog_init \
   libjsi \
diff --git a/ReactCommon/react/renderer/core/Android.mk b/ReactCommon/react/renderer/core/Android.mk
index e6544446d4f..8f5400379d7 100644
--- a/ReactCommon/react/renderer/core/Android.mk
+++ b/ReactCommon/react/renderer/core/Android.mk
@@ -16,8 +16,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 
 LOCAL_SHARED_LIBRARIES := \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog \
   libjsi \
   libreact_debug \
diff --git a/ReactCommon/react/renderer/debug/Android.mk b/ReactCommon/react/renderer/debug/Android.mk
index 676b2bfae83..45a08f478aa 100644
--- a/ReactCommon/react/renderer/debug/Android.mk
+++ b/ReactCommon/react/renderer/debug/Android.mk
@@ -15,7 +15,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 
-LOCAL_SHARED_LIBRARIES := libfolly_json
+LOCAL_SHARED_LIBRARIES := libfolly_runtime
 
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
diff --git a/ReactCommon/react/renderer/graphics/Android.mk b/ReactCommon/react/renderer/graphics/Android.mk
index 57f0d3821c1..d1078d99ab4 100644
--- a/ReactCommon/react/renderer/graphics/Android.mk
+++ b/ReactCommon/react/renderer/graphics/Android.mk
@@ -15,8 +15,7 @@ LOCAL_SHARED_LIBRARIES := \
   glog \
   libfb \
   libfbjni \
-  libfolly_json \
-  libfolly_json \
+  libfolly_runtime \
   libreact_debug
 
 LOCAL_STATIC_LIBRARIES :=
diff --git a/ReactCommon/react/renderer/imagemanager/Android.mk b/ReactCommon/react/renderer/imagemanager/Android.mk
index 6a3c88ddb4d..a7013405950 100644
--- a/ReactCommon/react/renderer/imagemanager/Android.mk
+++ b/ReactCommon/react/renderer/imagemanager/Android.mk
@@ -12,7 +12,7 @@ LOCAL_MODULE := react_render_imagemanager
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp $(LOCAL_PATH)/platform/cxx/react/renderer/imagemanager/*.cpp)
 
 LOCAL_SHARED_LIBRARIES := \
-  libfolly_json \
+  libfolly_runtime \
   libreact_debug \
   libreact_render_core \
   libreact_render_debug \
diff --git a/ReactCommon/react/renderer/mounting/Android.mk b/ReactCommon/react/renderer/mounting/Android.mk
index f9fb22951b2..613d77b3e93 100644
--- a/ReactCommon/react/renderer/mounting/Android.mk
+++ b/ReactCommon/react/renderer/mounting/Android.mk
@@ -24,8 +24,7 @@ LOCAL_STATIC_LIBRARIES :=
 LOCAL_SHARED_LIBRARIES := \
   glog \
   libbutter \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libjsi \
   libreact_debug \
diff --git a/ReactCommon/react/renderer/scheduler/Android.mk b/ReactCommon/react/renderer/scheduler/Android.mk
index 26a922c29cf..246af42a944 100644
--- a/ReactCommon/react/renderer/scheduler/Android.mk
+++ b/ReactCommon/react/renderer/scheduler/Android.mk
@@ -23,8 +23,7 @@ LOCAL_STATIC_LIBRARIES :=
 
 LOCAL_SHARED_LIBRARIES := \
   glog \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libjsi \
   libreact_debug \
   libreact_render_componentregistry \
diff --git a/ReactCommon/react/renderer/telemetry/Android.mk b/ReactCommon/react/renderer/telemetry/Android.mk
index 060d8ddf99d..01456036442 100644
--- a/ReactCommon/react/renderer/telemetry/Android.mk
+++ b/ReactCommon/react/renderer/telemetry/Android.mk
@@ -24,8 +24,7 @@ LOCAL_STATIC_LIBRARIES :=
 LOCAL_SHARED_LIBRARIES := \
   glog \
   libbutter \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libreact_debug \
   libreact_render_core \
diff --git a/ReactCommon/react/renderer/templateprocessor/Android.mk b/ReactCommon/react/renderer/templateprocessor/Android.mk
index 5cf7a2e41d4..f6827f98027 100644
--- a/ReactCommon/react/renderer/templateprocessor/Android.mk
+++ b/ReactCommon/react/renderer/templateprocessor/Android.mk
@@ -23,8 +23,7 @@ LOCAL_STATIC_LIBRARIES :=
 
 LOCAL_SHARED_LIBRARIES := \
   glog \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libjsi \
   libreact_render_componentregistry \
   libreact_render_core \
diff --git a/ReactCommon/react/renderer/textlayoutmanager/Android.mk b/ReactCommon/react/renderer/textlayoutmanager/Android.mk
index c254a254e05..6a724e0e8f4 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/Android.mk
+++ b/ReactCommon/react/renderer/textlayoutmanager/Android.mk
@@ -15,8 +15,7 @@ LOCAL_SHARED_LIBRARIES := \
   glog \
   libfb \
   libfbjni \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libmapbufferjni \
   libreact_debug \
diff --git a/ReactCommon/react/renderer/uimanager/Android.mk b/ReactCommon/react/renderer/uimanager/Android.mk
index b393f1a6050..a492a5000fa 100644
--- a/ReactCommon/react/renderer/uimanager/Android.mk
+++ b/ReactCommon/react/renderer/uimanager/Android.mk
@@ -23,8 +23,7 @@ LOCAL_STATIC_LIBRARIES :=
 
 LOCAL_SHARED_LIBRARIES := \
   glog \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libjsi \
   libreact_debug \
   libreact_render_componentregistry \
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js
index 0c90cee8e4b..ad763698efe 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js
@@ -81,7 +81,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/${libraryName}
 
 LOCAL_SHARED_LIBRARIES := libfbjni \
-  libfolly_json \
+  libfolly_runtime \
   libglog \
   libjsi \
   libreact_codegen_rncore \
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap
index c9ddf301a47..7904f7d8b4b 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap
@@ -52,7 +52,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/SampleWithUppercaseName
 
-LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_json   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   librrc_view   libturbomodulejsijni   libyoga
+LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   librrc_view   libturbomodulejsijni   libyoga
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -116,7 +116,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/complex_objects
 
-LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_json   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   librrc_view   libturbomodulejsijni   libyoga
+LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   librrc_view   libturbomodulejsijni   libyoga
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -180,7 +180,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/empty_native_modules
 
-LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_json   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   librrc_view   libturbomodulejsijni   libyoga
+LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   librrc_view   libturbomodulejsijni   libyoga
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -244,7 +244,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/native_modules_with_type_aliases
 
-LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_json   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   librrc_view   libturbomodulejsijni   libyoga
+LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   librrc_view   libturbomodulejsijni   libyoga
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -316,7 +316,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/real_module_example
 
-LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_json   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   librrc_view   libturbomodulejsijni   libyoga
+LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   librrc_view   libturbomodulejsijni   libyoga
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -380,7 +380,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/simple_native_modules
 
-LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_json   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   librrc_view   libturbomodulejsijni   libyoga
+LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   librrc_view   libturbomodulejsijni   libyoga
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -452,7 +452,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/two_modules_different_files
 
-LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_json   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   librrc_view   libturbomodulejsijni   libyoga
+LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   librrc_view   libturbomodulejsijni   libyoga
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
diff --git a/packages/rn-tester/android/app/src/main/jni/Android.mk b/packages/rn-tester/android/app/src/main/jni/Android.mk
index 6cfdfccd460..a02ac90bccb 100644
--- a/packages/rn-tester/android/app/src/main/jni/Android.mk
+++ b/packages/rn-tester/android/app/src/main/jni/Android.mk
@@ -22,8 +22,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni
 LOCAL_SHARED_LIBRARIES := \
   libfabricjni \
   libfbjni \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog \
   libreact_codegen_rncore \
   libreact_codegen_rntester \
diff --git a/template/android/app/src/main/jni/Android.mk b/template/android/app/src/main/jni/Android.mk
index 0ae63667564..cda13912253 100644
--- a/template/android/app/src/main/jni/Android.mk
+++ b/template/android/app/src/main/jni/Android.mk
@@ -17,7 +17,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
 # If you wish to add a custom TurboModule or Fabric component in your app you
-# will have to uncomment those lines to include the generated source 
+# will have to uncomment those lines to include the generated source
 # files from the codegen (placed in $(GENERATED_SRC_DIR)/codegen/jni)
 #
 # LOCAL_C_INCLUDES += $(GENERATED_SRC_DIR)/codegen/jni
@@ -28,8 +28,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_SHARED_LIBRARIES := \
   libfabricjni \
   libfbjni \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog \
   libjsi \
   libreact_codegen_rncore \