Merge "Remove symlink libprocinfo"