Merge "Revert "Revert "Convert hardware/interfaces/compatibility_matric..."" into main