Merge "Close Fence FDs in error cases of Surface and GraphicBufferMapper"