Merge "Delete BUILT_VENDOR_MATRIX/SYSTEM_MANIFSET"
am: 4afdd0aac6

Change-Id: Ic71d86e902d243aeb649a50bcecbabb27d511424