Merge "Avoid closing invalid fds in GraphicBufferMapper"