Merge "Build DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE" am: 5b99454bc4
am: d8af35734f

Change-Id: Iff653c5b126985e33b1280e27806c20417904082