Merge "More O_DIRECTORY | O_NOFOLLOW changes"