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

Change-Id: I014a65bdfcc86e7c992b985f065ecf441dea0c46