am 592e6282: am 0e3234b7: am 1efe1bdd: Merge "More O_DIRECTORY | O_NOFOLLOW changes"

* commit '592e6282cd722ba8075239db85a2707e53f3d3f7':
  More O_DIRECTORY | O_NOFOLLOW changes