Allow multiple DEVICE_MATRIX_FILE
am: b47671be98

Change-Id: Id458b60055632b7dd9afc575e4fcb41de440e842