Merge "compatibility matrices: move to soong" am: 9cfddb6282 am: 9f897faa8b
am: 183ef4fba9

Change-Id: I0845142a5f723dcb35fbeadca846e9a63e63e2d2