diff --git a/current/Android.mk b/current/Android.mk
index 4a78b80..c3c5b79 100644
--- a/current/Android.mk
+++ b/current/Android.mk
@@ -28,18 +28,7 @@
     $(shell find $(LOCAL_PATH)/support -name "*.jar"))
 include $(BUILD_MULTI_PREBUILT)
 
-# Generates the v4 and v13 libraries with static dependencies.
+# Generates the v4, v13, and appcompat libraries with static dependencies.
 include $(call all-makefiles-under,$(LOCAL_PATH))
 
 endif  # TARGET_BUILD_APPS not empty
-
-# Also set up explicit prebuilts for use in apps.
-include $(CLEAR_VARS)
-SUPPORT_LIBS := \
-  $(patsubst $(LOCAL_PATH)/%,%,\
-    $(shell find $(LOCAL_PATH)/support -name "*.jar"))
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
-  $(foreach lib,$(SUPPORT_LIBS),\
-    $(basename $(notdir $(lib)))-prebuilt:$(lib))
-SUPPORT_LIBS :=
-include $(BUILD_MULTI_PREBUILT)
diff --git a/current/support-appcompat/Android.mk b/current/support-appcompat/Android.mk
new file mode 100644
index 0000000..72dc86b
--- /dev/null
+++ b/current/support-appcompat/Android.mk
@@ -0,0 +1,27 @@
+# Copyright (C) 2017 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+
+# Statically include transitive dependencies.
+include $(CLEAR_VARS)
+LOCAL_MODULE := android-support-v7-appcompat
+LOCAL_SDK_VERSION := current
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-v7-appcompat-nodeps \
+    android-support-vectordrawable \
+    android-support-animatedvectordrawable
+LOCAL_JAR_EXCLUDE_FILES := none
+LOCAL_JAVA_LANGUAGE_VERSION := 1.7
+include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/current/support-v13/Android.mk b/current/support-v13/Android.mk
index e1048f6..774b923 100644
--- a/current/support-v13/Android.mk
+++ b/current/support-v13/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2011 The Android Open Source Project
+# Copyright (C) 2017 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/current/support-v4/Android.mk b/current/support-v4/Android.mk
index 3ce936b..8826608 100644
--- a/current/support-v4/Android.mk
+++ b/current/support-v4/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2016 The Android Open Source Project
+# Copyright (C) 2017 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/current/support/v13-nodeps/android-support-v13-nodeps.jar b/current/support/v13/android-support-v13-nodeps.jar
similarity index 100%
rename from current/support/v13-nodeps/android-support-v13-nodeps.jar
rename to current/support/v13/android-support-v13-nodeps.jar
Binary files differ
diff --git a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar b/current/support/v7/appcompat/libs/android-support-v7-appcompat-nodeps.jar
similarity index 100%
rename from current/support/v7/appcompat/libs/android-support-v7-appcompat.jar
rename to current/support/v7/appcompat/libs/android-support-v7-appcompat-nodeps.jar
Binary files differ