device_matrix.xml -> vendor_*
am: 5b973e7b73

Change-Id: I4ae25e326a192cca69f3401ad002d642ef91f1f9