Merge "Build DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE"
am: 5b99454bc4

Change-Id: Id7643e0d8894444c474e287f292d59ef896745a4