Merge "Make lib dir before changing ownership of app dir" into jb-dev