Merge "Removed dependecies between BufferQueue and SurfaceTexture"