diff --git a/build/Android.mk b/build/Android.mk
index 31270954d..0e1f83380 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -121,7 +121,8 @@ ANDROID_SUPPORT_LIBRARIES := \
     android-support-multidex \
     android-support-multidex-instrumentation \
     android-support-design \
-    android-support-percent
+    android-support-percent \
+    android-support-customtabs
 
 $(foreach lib, $(ANDROID_SUPPORT_LIBRARIES), $(eval $(call _package_sdk_library,$(lib))))
 
diff --git a/build/sdk.atree b/build/sdk.atree
index e6bfe1dd7..787e42b41 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -521,6 +521,8 @@ frameworks/support/percent/res
 frameworks/support/percent/src/.readme                                                             extras/android/support/percent/src/.readme
 ${OUT_DIR}/target/common/obj/PACKAGING/android-support-percent_intermediates/android-support-percent.jar    extras/android/support/percent/libs/android-support-percent.jar
 
+frameworks/support/customtabs/AndroidManifest.xml                                                     extras/android/support/customtabs/AndroidManifest.xml
+${OUT_DIR}/target/common/obj/PACKAGING/android-support-customtabs_intermediates/android-support-customtabs.jar    extras/android/support/customtabs/libs/android-support-customtabs.jar
 ##############################################################################
 # Tests Component
 ##############################################################################