Snap for 6142138 from 038d476bc08b77477f039d44a68117b6e24cca3e to rvc-release

Change-Id: I583a7a07ea98a5adfb445be32388a1159cadef83
diff --git a/uml.mk b/uml.mk
index e9c7099..9657f20 100644
--- a/uml.mk
+++ b/uml.mk
@@ -88,12 +88,12 @@
     vndservice \
     vndservicemanager \
 
-# VINTF data
+# VINTF stuff for system and vendor (no product / odm / system_ext / etc.)
 PRODUCT_PACKAGES += \
-    device_compatibility_matrix.xml \
-    device_manifest.xml \
-    framework_manifest.xml \
-    framework_compatibility_matrix.xml \
+    vendor_compatibility_matrix.xml \
+    vendor_manifest.xml \
+    system_manifest.xml \
+    system_compatibility_matrix.xml \
 
 # SELinux packages are added as dependencies of the selinux_policy
 # phony package.