Merge "ACodec: Reduce the TWOmxNode wrapper in GraphicBufferSource"