Merge "Remove <nativehelper/ScopedFd.h>."