Merge "Avoid closing invalid FD in Surface and GraphicBufferMapper"