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

Change-Id: Ib2b55cc72c9d05c469a560f07bbba4077e518b6d