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

* commit 'e4af2b9c7ce8ea6f77674f11a25b601abc5055a6':