diff --git a/output_data/iana/Android.bp b/output_data/iana/Android.bp
new file mode 100644
index 0000000..b96ae16
--- /dev/null
+++ b/output_data/iana/Android.bp
@@ -0,0 +1,51 @@
+// Copyright (C) 2019 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.
+
+prebuilt_usr_share {
+    name: "tzdata",
+    src: "tzdata",
+    sub_dir: "zoneinfo",
+}
+
+// A host version of the tzdata module for use by
+// hostdex rules.
+
+// Simulate /system
+prebuilt_usr_share_host {
+    name: "tzdata_host",
+    src: "tzdata",
+    filename_from_src: true,
+    sub_dir: "zoneinfo",
+    target: {
+        darwin: {
+            enabled: false,
+        },
+    },
+}
+
+// Module definition producing a tzdata prebuilt file in
+// /system/etc/tz for standalone ART testing purposes. This is a
+// temporary change needed until the ART Buildbot and Golem both fully
+// support the Runtime APEX (see b/121117762). This module should never
+// be shipped by default (i.e. should never be part of
+// `PRODUCT_PACKAGE`.)
+
+// TODO(b/121117762, b/129332183): Remove this module definition when
+// the ART Buildbot and Golem have full support for the Runtime APEX.
+prebuilt_etc {
+    name: "tzdata-art-test",
+    src: "tzdata",
+    filename_from_src: true,
+    sub_dir: "tz",
+}
diff --git a/output_data/iana/Android.mk b/output_data/iana/Android.mk
index f862a1d..150860f 100644
--- a/output_data/iana/Android.mk
+++ b/output_data/iana/Android.mk
@@ -15,30 +15,11 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := tzdata
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT)/usr/share/zoneinfo
-include $(BUILD_PREBUILT)
-
 ifeq ($(WITH_HOST_DALVIK),true)
 
 # A host version of the tzdata module for use by
 # hostdex rules.
 
-# Simulate /system
-include $(CLEAR_VARS)
-LOCAL_MODULE := tzdata_host
-LOCAL_IS_HOST_MODULE := true
-LOCAL_SRC_FILES := tzdata
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_STEM := $(LOCAL_SRC_FILES)
-LOCAL_MODULE_PATH := $(HOST_OUT)/usr/share/zoneinfo
-include $(BUILD_PREBUILT)
-
 # Simulate the runtime module.
 include $(CLEAR_VARS)
 LOCAL_MODULE := tzdata_host_runtime_apex
@@ -51,21 +32,3 @@
 include $(BUILD_PREBUILT)
 
 endif
-
-# Module definition producing a tzdata prebuilt file in
-# /system/etc/tz for standalone ART testing purposes. This is a
-# temporary change needed until the ART Buildbot and Golem both fully
-# support the Runtime APEX (see b/121117762). This module should never
-# be shipped by default (i.e. should never be part of
-# `PRODUCT_PACKAGE`.)
-#
-# TODO(b/121117762, b/129332183): Remove this module definition when
-# the ART Buildbot and Golem have full support for the Runtime APEX.
-include $(CLEAR_VARS)
-LOCAL_MODULE := tzdata-art-test
-LOCAL_MODULE_STEM := tzdata
-LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM)
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/tz
-include $(BUILD_PREBUILT)