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

Change-Id: I3e88b69a9ed6f57c1b5d011349473b3c568bc74f