am 1efe1bdd: Merge "More O_DIRECTORY | O_NOFOLLOW changes"

* commit '1efe1bdde9baf40741febbf965ce01a4168a7860':
  More O_DIRECTORY | O_NOFOLLOW changes