Allow multiple DEVICE_MATRIX_FILE
am: f2211cd3bc

Change-Id: I50462ef7dcdbbc9fb2f4f4636b2140ae60a2236f