Merge "vold: cleanups for O_CLOEXEC tidy checks."