Merge "libmedia: Fix channelMaskFromString function" into oc-mr1-dev