Merge "com_android_internal_os_AtomicDirectory.cpp: add O_CLOEXEC"