Merge "Ensure that app lib symlinks are correctly labeled when created."