diff --git a/widget/android/AndroidBridge.cpp b/widget/android/AndroidBridge.cpp
index 50fc9fb069e..af8d8a43849 100644
--- a/widget/android/AndroidBridge.cpp
+++ b/widget/android/AndroidBridge.cpp
@@ -47,7 +47,7 @@ using namespace mozilla;
 
 NS_IMPL_ISUPPORTS0(nsFilePickerCallback)
 
-StaticRefPtr<AndroidBridge> AndroidBridge::sBridge;
+nsRefPtr<AndroidBridge> AndroidBridge::sBridge = nullptr;
 static unsigned sJavaEnvThreadIndex = 0;
 static void JavaThreadDetachFunc(void *arg);
 
@@ -1431,7 +1431,7 @@ namespace mozilla {
         nsCOMPtr<nsIThread> mMainThread;
 
     };
-    StaticRefPtr<TracerRunnable> sTracerRunnable;
+    nsCOMPtr<TracerRunnable> sTracerRunnable;
 
     bool InitWidgetTracing() {
         if (!sTracerRunnable)
diff --git a/widget/android/AndroidBridge.h b/widget/android/AndroidBridge.h
index 0e9b8fc2396..25e931ce296 100644
--- a/widget/android/AndroidBridge.h
+++ b/widget/android/AndroidBridge.h
@@ -421,7 +421,7 @@ public:
                             const int32_t      aPort,
                             nsACString & aResult);
 protected:
-    static StaticRefPtr<AndroidBridge> sBridge;
+    static nsRefPtr<AndroidBridge> sBridge;
     nsTArray<nsCOMPtr<nsIMobileMessageCallback> > mSmsRequests;
 
     // the global JavaVM
diff --git a/widget/android/AndroidGraphicBuffer.cpp b/widget/android/AndroidGraphicBuffer.cpp
index 00140e93285..a7c0ba8d771 100644
--- a/widget/android/AndroidGraphicBuffer.cpp
+++ b/widget/android/AndroidGraphicBuffer.cpp
@@ -89,21 +89,7 @@ static bool gTryRealloc = true;
 static class GLFunctions
 {
 public:
-  MOZ_CONSTEXPR GLFunctions() : mInitialized(false),
-                                fGetDisplay(nullptr),
-                                fEGLGetError(nullptr),
-                                fCreateImageKHR(nullptr),
-                                fDestroyImageKHR(nullptr),
-                                fImageTargetTexture2DOES(nullptr),
-                                fBindTexture(nullptr),
-                                fGLGetError(nullptr),
-                                fGraphicBufferCtor(nullptr),
-                                fGraphicBufferDtor(nullptr),
-                                fGraphicBufferLock(nullptr),
-                                fGraphicBufferLockRect(nullptr),
-                                fGraphicBufferUnlock(nullptr),
-                                fGraphicBufferGetNativeBuffer(nullptr),
-                                fGraphicBufferReallocate(nullptr)
+  GLFunctions() : mInitialized(false)
   {
   }