Merge "OMX Opus decoder omits sample rate / channel count"