Cleanup: Rename SkOSPath functions.

src/ports/SkFontHost_linux.cpp

Index: src/ports/SkFontHost_linux.cpp
diff --git a/src/ports/SkFontHost_linux.cpp b/src/ports/SkFontHost_linux.cpp
index 498d69ffe03f64f5d3fc31a83e52c60bf03057f8..891e4617f3e6f6e2ec03979d330afe47ea2b1b9c 100644
--- a/src/ports/SkFontHost_linux.cpp
+++ b/src/ports/SkFontHost_linux.cpp
@@ -323,7 +323,7 @@ private:
 
         while (iter.next(&name, false)) {
             SkString filename(
-                SkOSPath::SkPathJoin(directory.c_str(), name.c_str()));
+                SkOSPath::Join(directory.c_str(), name.c_str()));
 
             bool isFixedPitch;
             SkString realname;
@@ -354,8 +354,7 @@ private:
             if (name.startsWith(".")) {
                 continue;
             }
-            SkString dirname(
-                SkOSPath::SkPathJoin(directory.c_str(), name.c_str()));
+            SkString dirname(SkOSPath::Join(directory.c_str(), name.c_str()));
             load_directory_fonts(dirname);
         }
     }