Merge "Delete BUILT_VENDOR_MATRIX/SYSTEM_MANIFSET" am: 4afdd0aac6 am: 71313330cd

Change-Id: I014a65bdfcc86e7c992b985f065ecf441dea0c46
diff --git a/vintfdata/Android.mk b/vintfdata/Android.mk
index 9497c80..b345308 100644
--- a/vintfdata/Android.mk
+++ b/vintfdata/Android.mk
@@ -60,7 +60,6 @@
 
 LOCAL_PREBUILT_MODULE_FILE := $(GEN)
 include $(BUILD_PREBUILT)
-BUILT_VENDOR_MATRIX := $(LOCAL_BUILT_MODULE)
 
 # System Manifest
 include $(CLEAR_VARS)
@@ -82,7 +81,6 @@
 
 LOCAL_PREBUILT_MODULE_FILE := $(GEN)
 include $(BUILD_PREBUILT)
-BUILT_SYSTEM_MANIFEST := $(LOCAL_BUILT_MODULE)
 
 # Product Manifest
 ifneq ($(PRODUCT_MANIFEST_FILES),)