Revert D46769581: Keep all the HybridData's members

Differential Revision:
D46769581

Original commit changeset: 9ee17e490e65

Original Phabricator Diff: D46769581

fbshipit-source-id: dc05c4cfcb6e6fecf4726b6025e2a1eee4189c02

java/com/facebook/jni/HybridData.java

@@ -16,7 +16,7 @@
 
 package com.facebook.jni;
 
-import com.facebook.jni.annotations.DoNotStripAny;
+import com.facebook.jni.annotations.DoNotStrip;
 import com.facebook.soloader.nativeloader.NativeLoader;
 
 /**
@@ -27,14 +27,14 @@
  * <p>{@link #resetNative} deletes the corresponding native object synchronously on whatever thread
  * the method is called on. Otherwise, deletion will occur on the {@link DestructorThread} thread.
  */
-@DoNotStripAny
+@DoNotStrip
 public class HybridData {
 
   static {
     NativeLoader.loadLibrary("fbjni");
   }
 
-  private final Destructor mDestructor = new Destructor(this);
+  @DoNotStrip private Destructor mDestructor = new Destructor(this);
 
   /**
    * To explicitly delete the instance, call resetNative(). If the C++ instance is referenced after
@@ -64,11 +64,11 @@ public boolean isValid() {
     return mDestructor.mNativePointer != 0;
   }
 
-  @DoNotStripAny
+  @DoNotStrip
   public static class Destructor extends DestructorThread.Destructor {
 
     // Private C++ instance
-    private volatile long mNativePointer;
+    @DoNotStrip private volatile long mNativePointer;
 
     Destructor(Object referent) {
       super(referent);