diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle
index a93e779cf..5c53a1173 100644
--- a/ReactAndroid/build.gradle
+++ b/ReactAndroid/build.gradle
@@ -276,6 +276,7 @@ dependencies {
     compile 'javax.inject:javax.inject:1'
     compile 'com.android.support:appcompat-v7:23.0.1'
     compile 'com.android.support:recyclerview-v7:23.0.1'
+    compile 'com.facebook.fbui.textlayoutbuilder:textlayoutbuilder:1.0.0'
     compile 'com.facebook.fresco:fresco:0.11.0'
     compile 'com.facebook.fresco:imagepipeline-okhttp3:0.11.0'
     compile 'com.facebook.soloader:soloader:0.1.0'
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/BUCK b/ReactAndroid/src/main/java/com/facebook/react/flat/BUCK
new file mode 100644
index 000000000..1680f79c5
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/BUCK
@@ -0,0 +1,35 @@
+include_defs('//ReactAndroid/DEFS')
+
+android_library(
+  name = 'flat',
+  srcs = glob(['*.java']),
+  deps = [
+    YOGA_TARGET,
+    react_native_dep('libraries/fresco/fresco-react-native:fbcore'),
+    react_native_dep('libraries/fresco/fresco-react-native:fresco-drawee'),
+    react_native_dep('libraries/fresco/fresco-react-native:fresco-react-native'),
+    react_native_dep('libraries/fresco/fresco-react-native:imagepipeline'),
+    react_native_dep('libraries/textlayoutbuilder:textlayoutbuilder'),
+    react_native_dep('third-party/android/support/v4:lib-support-v4'),
+    react_native_dep('third-party/java/infer-annotations:infer-annotations'),
+    react_native_dep('third-party/java/jsr-305:jsr-305'),
+    react_native_target('java/com/facebook/react/bridge:bridge'),
+    react_native_target('java/com/facebook/react/common:common'),
+    react_native_target('java/com/facebook/react/modules/i18nmanager:i18nmanager'),
+    react_native_target('java/com/facebook/react/touch:touch'),
+    react_native_target('java/com/facebook/react/uimanager:uimanager'),
+    react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
+    react_native_target('java/com/facebook/react/views/art:art'),
+    react_native_target('java/com/facebook/react/views/image:image'),
+    react_native_target('java/com/facebook/react/views/imagehelper:withmultisource'),
+    react_native_target('java/com/facebook/react/views/modal:modal'),
+    react_native_target('java/com/facebook/react/views/text:text'),
+    react_native_target('java/com/facebook/react/views/textinput:textinput'),
+    react_native_target('java/com/facebook/react/views/view:view'),
+    react_native_target('java/com/facebook/react/views/viewpager:viewpager'),
+  ],
+  visibility = [
+    'PUBLIC',
+  ],
+)
+
diff --git a/ReactAndroid/src/main/libraries/textlayoutbuilder/BUCK b/ReactAndroid/src/main/libraries/textlayoutbuilder/BUCK
new file mode 100644
index 000000000..4a26d36ad
--- /dev/null
+++ b/ReactAndroid/src/main/libraries/textlayoutbuilder/BUCK
@@ -0,0 +1,32 @@
+android_library(
+    name = 'textlayoutbuilder',
+    exported_deps = [
+      ':textlayoutbuilder-base',
+      ':staticlayoutproxy',
+    ],
+    visibility = ['//ReactAndroid/...',],
+)
+
+android_prebuilt_aar(
+    name = 'textlayoutbuilder-base',
+    aar = ':textlayoutbuilder-base-aar',
+    visibility = ['//ReactAndroid/...',],
+)
+
+remote_file(
+    name = 'textlayoutbuilder-base-aar',
+    url = 'mvn:com.facebook.fbui.textlayoutbuilder:textlayoutbuilder:aar:1.0.0',
+    sha1 = '29bc8e5a1e2b33944b88277652ee83092ae1dbc0',
+)
+
+prebuilt_jar(
+    name = 'staticlayoutproxy',
+    binary_jar = ':staticlayoutproxy-jar',
+    visibility = ['//ReactAndroid/...',],
+)
+
+remote_file(
+    name = 'staticlayoutproxy-jar',
+    url = 'mvn:com.facebook.fbui.textlayoutbuilder:staticlayout-proxy:jar:1.0',
+    sha1 = 'f162442a19fff13995fbd51ba414d9ee05579080',
+)