diff --git a/BUCK b/BUCK
index 556c5d2c4771..5f25822b4083 100644
--- a/BUCK
+++ b/BUCK
@@ -173,6 +173,21 @@ android_prebuilt_aar(
     aar = 'extlibs/floatingactionbutton.aar',
 )
 
+android_prebuilt_aar(
+    name = 'persistentedittext',
+    aar = 'extlibs/persistentedittext.aar',
+)
+
+android_prebuilt_aar(
+    name = 'graphview',
+    aar = 'extlibs/graphview.aar',
+)
+
+android_prebuilt_aar(
+    name = 'wpcomrest',
+    aar = 'extlibs/wpcomrest.aar',
+)
+
 ### WordPressUtils
 
 android_build_config(
@@ -219,40 +234,6 @@ r_android_library(
     ]
 )
 
-### PersistentEditText
-
-android_resource(
-    name = 'persistentedittext-res',
-    package = 'org.wordpress.persistentedittext',
-    res = 'libs/persistentedittext/PersistentEditText/src/main/res',
-)
-
-r_android_library(
-    name = 'persistentedittext',
-    srcs = glob(['libs/persistentedittext/PersistentEditText/src/main/java/**/*.java']),
-    deps = [
-        ':persistentedittext-res',
-    ]
-)
-
-### WPComRest
-
-r_android_library(
-    name = 'wpcomrest',
-    srcs = glob(['libs/wpcomrest/WordPressComRest/src/main/java/**/*.java']),
-    deps = [
-        ':all-jars', # volley
-    ]
-)
-
-### WPGraphView
-
-r_android_library(
-    name = 'wpgraphview',
-    srcs = glob(['libs/graphview/WordPressGraphView/src/main/java/**/*.java']),
-)
-
-
 ### WordPressAnalytics
 
 r_android_library(
@@ -295,7 +276,6 @@ android_resource(
         ':appcompat-v7',
         ':wpandroid-utils',
         ':wpandroid-utils-res',
-        ':persistentedittext-res',
         ':wpandroid-editor-res',
         ':drag-sort-listview',
         ':mediapicker',
@@ -326,7 +306,7 @@ r_android_library(
         ':wpandroid-editor',
         ':wpcomrest',
         ':wpanalytics',
-        ':wpgraphview',
+        ':graphview',
         ':build-config',
         ':drag-sort-listview',
         ':simperium',
diff --git a/tools/fetch_buck_dependencies.py b/tools/fetch_buck_dependencies.py
index 61268a971f6b..5988abccc3e3 100755
--- a/tools/fetch_buck_dependencies.py
+++ b/tools/fetch_buck_dependencies.py
@@ -60,6 +60,9 @@ def get_sdk_dir_from_localproperties():
 'undobar': {'url': 'https://repo1.maven.org/maven2/com/cocosw/undobar/1.6/undobar-1.6.aar'},
 'volley': {'url': 'https://repo1.maven.org/maven2/com/mcxiaoke/volley/library/1.0.15/library-1.0.15.jar'},
 'floatingactionbutton': {'url': 'https://repo1.maven.org/maven2/com/getbase/floatingactionbutton/1.9.0/floatingactionbutton-1.9.0.aar'},
+'wpcomrest': {'url': 'https://repo1.maven.org/maven2/com/automattic/rest/1.0.1/rest-1.0.1.aar'},
+'persistentedittext': {'url': 'https://repo1.maven.org/maven2/org/wordpress/persistentedittext/1.0.1/persistentedittext-1.0.1.aar'},
+'graphview': {'url': 'https://repo1.maven.org/maven2/org/wordpress/graphview/3.3.0/graphview-3.3.0.aar'},
 }
 
 TEST_DEPENDENCIES = {