am f0c17b08: Merge "Avoid closing invalid FD in Surface and GraphicBufferMapper"

* commit 'f0c17b0831512cc700414d12dee1e84fb174bbbe':
  Avoid closing invalid FD in Surface and GraphicBufferMapper