[automerger skipped] Merge "Build DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE" into pi-dev
am: 4e2a68ee79  -s ours

Change-Id: Ib4c0698382d40d041265569ed4bf60fed4b4112a