Merge "Refactored ISurfaceTexture calls from SurfaceTexture into BufferQueue."