Merge "MediaCodec: Release lock before calling onFrameRendered()"