Merge "Add target preparer to add packages to whitelist"
diff --git a/Android.mk b/Android.mk
index 4f0bf16..ffbc110 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,6 +13,8 @@
 # limitations under the License.
 
 LOCAL_PATH := $(call my-dir)
+COMPATIBILITY.tradefed_tests_dir := \
+  $(COMPATIBILITY.tradefed_tests_dir) $(LOCAL_PATH)/res/config $(LOCAL_PATH)/prod-tests/res/config
 
 include $(CLEAR_VARS)