am e583bcf1: Merge "Explicitly set lib dir permissions during unlink" into jb-dev

* commit 'e583bcf13c13957bdf20f8bc5e23258b083b2f51':
  Explicitly set lib dir permissions during unlink