diff --git a/distro/core/Android.mk b/distro/core/Android.mk
index cc5522f..806eeea 100644
--- a/distro/core/Android.mk
+++ b/distro/core/Android.mk
@@ -16,12 +16,26 @@
 
 # Library of classes for handling time zone distros. Used on-device for
 # handling distros and within CTS tests.
+#
+# This is distinct from time_zone_distro_unbundled. It should be used
+# for platform code as it avoids circular dependencies when stubs targets
+# need to build framework (as appears to be the case in aosp/master).
 include $(CLEAR_VARS)
 LOCAL_MODULE := time_zone_distro
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(call all-java-files-under, src/main)
 LOCAL_JAVACFLAGS := -encoding UTF-8
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+# Library of classes for handling time zone distros. Used in unbundled
+# cases. Same as above, except dependent on system_current stubs.
+include $(CLEAR_VARS)
+LOCAL_MODULE := time_zone_distro_unbundled
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(call all-java-files-under, src/main)
+LOCAL_JAVACFLAGS := -encoding UTF-8
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_SDK_VERSION := system_current
 include $(BUILD_STATIC_JAVA_LIBRARY)