Merge "Build DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE."
am: 40877b8c21

Change-Id: I1e0a6937828b6b3ac3468edebfe793d2f21855ae