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

* commit 'ed6e907bc7a259d85c6a6c141a06a06e5c0b224c':
  Close Fence FDs in error cases of Surface and GraphicBufferMapper