Merge "libaudiohal@aidl: Work around use of unsupported mix port configurations" into main