Merge "Revert "Convert hardware/interfaces/compatibility_matrices/Andro..."" into main