Allow multiple DEVICE_MATRIX_FILE.
am: 5a51ea59ce

Change-Id: Icfc8cb0f5bd7666dcb7d317ed3236b672daaf685