Allow multiple DEVICE_MATRIX_FILE am: f2211cd3bc
am: 03e1eac34e

Change-Id: I0809da81ab60e327754d800f5bfad557ae27cd8a