Merge "Fix a GraphicBuffer leak in SurfaceTexture"