Merge "MediaCodec: use setInternalStateLocked to set Linear/GraphicBlock contexts"