Merge "Revert "Removed dependecies between BufferQueue and SurfaceTexture""