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

* commit 'e34de3a77b5f4d408af3f812b304475e858246ec':
  installd _delete_dir_contents: add O_NOFOLLOW