Merge "Use new version of IGraphicBufferProducer"