diff --git a/build/Android.mk b/build/Android.mk
index 9707881e1..cb2dcfb7e 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -123,7 +123,9 @@ ANDROID_SUPPORT_LIBRARIES := \
     android-support-v7-gridlayout \
     android-support-v7-appcompat \
     android-support-v7-mediarouter \
+    android-support-v7-recyclerview \
     android-support-v13 \
+    android-support-v17-leanback \
     android-support-multidex \
     android-support-multidex-instrumentation
 
diff --git a/build/sdk.atree b/build/sdk.atree
index 3d2b505e1..a91891c2f 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -389,6 +389,19 @@ ${OUT_DIR}/target/common/obj/PACKAGING/android-support-v7-mediarouter_intermedia
 
 development/samples/Support7Demos                                                                 extras/android/support/samples/Support7Demos
 
+# TODO: add .project, .classpath, etc.
+frameworks/support/v7/recyclerview/README.txt                                                     extras/android/support/v7/recyclerview/README.txt
+frameworks/support/v7/recyclerview/AndroidManifest.xml                                            extras/android/support/v7/recyclerview/AndroidManifest.xml
+${OUT_DIR}/target/common/obj/PACKAGING/android-support-v7-recyclerview_intermediates/android-support-v7-recyclerview.jar    extras/android/support/v7/recyclerview/android-support-v7-recyclerview.jar
+
+frameworks/support/v17/leanback/README.txt                                                        extras/android/support/v17/leanback/README.txt
+frameworks/support/v17/leanback/.project                                                          extras/android/support/v17/leanback/.project
+frameworks/support/v17/leanback/.classpath                                                        extras/android/support/v17/leanback/.classpath
+frameworks/support/v17/leanback/AndroidManifest.xml                                               extras/android/support/v17/leanback/AndroidManifest.xml
+frameworks/support/v17/leanback/project.properties                                                extras/android/support/v17/leanback/project.properties
+frameworks/support/v17/leanback/res                                                               extras/android/support/v17/leanback/res
+${OUT_DIR}/target/common/obj/PACKAGING/android-support-v17-leanback_intermediates/android-support-v17-leanback.jar    extras/android/support/v17/leanback/libs/android-support-v17-leanback.jar
+
 ##############################################################################
 # Tests Component
 ##############################################################################