Merge "MediaCodec: fix encrypted block handling" into rvc-dev