Merge "Ensure that app lib symlinks are correctly labeled when created." into cm-11.0
(cherry picked from commit e29da25682bbcf3c2be51c47002db5de2285977d)