Merge "Use libbase for realpath and dirname"