Merge "AudioCapabilities: handle non-standard codec max input channels" into oc-dev