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

Change-Id: Ieb37cb09304279677aad2a5944a6529881af0296