device_matrix.xml -> vendor_* am: 5b973e7b73 am: cb75339498

Change-Id: I225d10692515e94704fa034f5f2212aec7aa8bfb