Merge "MediaCodec: add CSD description for FLAC"