Pull an updated version of fbjni into RN OSS

Differential Revision: D3521227

fbshipit-source-id: 57db97ea2af2b2c9e55f380ce05d9e78a5f9d48c

ReactAndroid/src/main/java/com/facebook/jni/HybridData.java

@@ -1,15 +1,9 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
+// Copyright 2004-present Facebook. All Rights Reserved.
 
 package com.facebook.jni;
 
 import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.soloader.SoLoader;
 
 /**
  * This object holds a native C++ member for hybrid Java/C++ objects.
@@ -24,14 +18,15 @@ import com.facebook.proguard.annotations.DoNotStrip;
  */
 @DoNotStrip
 public class HybridData {
+
+  static {
+    SoLoader.loadLibrary("fb");
+  }
+
   // Private C++ instance
   @DoNotStrip
   private long mNativePointer = 0;
 
-  public HybridData() {
-    Prerequisites.ensure();
-  }
-
   /**
    * To explicitly delete the instance, call resetNative().  If the C++
    * instance is referenced after this is called, a NullPointerException will
@@ -47,4 +42,8 @@ public class HybridData {
     resetNative();
     super.finalize();
   }
+
+  public boolean isValid() {
+    return mNativePointer != 0;
+  }
 }