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

Change-Id: I3341942ce2dc8db558efa84b38e60313bc8e54b2