Merge "Build DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE." am: 40877b8c21 am: f84ae41b1e
am: 64e1a4bc74

Change-Id: Ie516f512aa82c23b94c3dbbec1bdd27fde7d8134