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

* commit '00efe44923af27094cfc201064ed920f93b0bde0':
  Explicitly set lib dir permissions during unlink