am a1b2eaa2: Merge "installd _delete_dir_contents: add O_NOFOLLOW"

* commit 'a1b2eaa2644843787c4ed8c2f62faa125b40d3f7':
  installd _delete_dir_contents: add O_NOFOLLOW