am c45bad1d: am a1b2eaa2: Merge "installd _delete_dir_contents: add O_NOFOLLOW"

* commit 'c45bad1dc14a7af1e72ad3585b3b057c38fcec3f':
  installd _delete_dir_contents: add O_NOFOLLOW