Revert of Fix race condition in parallel font initialization.

src/ports/SkFontConfigInterface_android.cpp

Index: src/ports/SkFontConfigInterface_android.cpp
diff --git a/src/ports/SkFontConfigInterface_android.cpp b/src/ports/SkFontConfigInterface_android.cpp
index 1f901b9fa9f7457e876c12039656d950551a8153..20e6c5eb84b6270b4b93b9979985e575d27f848c 100644
--- a/src/ports/SkFontConfigInterface_android.cpp
+++ b/src/ports/SkFontConfigInterface_android.cpp
@@ -155,8 +155,7 @@
     return gFontConfigInterface;
 }
 
-SkFontConfigInterface* SkFontConfigInterface::GetSingletonDirectInterface(SkBaseMutex*) {
-    // Doesn't need passed-in mutex because getSingletonInterface() uses one
+SkFontConfigInterface* SkFontConfigInterface::GetSingletonDirectInterface() {
     return getSingletonInterface();
 }