Merge "Move ScopedFd from libcore to libnativehelper (part 1)"