Merge "media: minor fixes for MediaCodecInfo" into lmp-dev