Merge "Allow multiple DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILEs." am: f3378017ea
am: 48833e5a4e

Change-Id: I5ffde0d5a1ef806d4b568bc70267677b1db35044