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

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