Merge "media: fix OMX aliases for audio encoders"