Merge "replace getISurfaceTexture by getIGraphicBufferProducer"