Update clang-tools to ab/6114689 and replace type_ids

am: 1386afd34e

Change-Id: I1a63bd0b04f76b8207f8b156edcf77f7b61fab87

6 files changed, 17297 insertions, 19028 deletions

diff --git a/R/64/arm64_armv8-a/source-based/libbinder_ndk.so.lsdump b/R/64/arm64_armv8-a/source-based/libbinder_ndk.so.lsdump
index c412935..1deeddb 100644
--- a/R/64/arm64_armv8-a/source-based/libbinder_ndk.so.lsdump
+++ b/R/64/arm64_armv8-a/source-based/libbinder_ndk.so.lsdump
@@ -8,8 +8,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIDs",
    "name" : "char16_t",
-   "referenced_type" : "type-643",
-   "self_type" : "type-643",
+   "referenced_type" : "_ZTIDs",
+   "self_type" : "_ZTIDs",
    "size" : 2
   },
   {
@@ -17,8 +17,8 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIa",
    "name" : "signed char",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
+   "referenced_type" : "_ZTIa",
+   "self_type" : "_ZTIa",
    "size" : 1
   },
   {
@@ -27,8 +27,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIb",
    "name" : "bool",
-   "referenced_type" : "type-596",
-   "self_type" : "type-596",
+   "referenced_type" : "_ZTIb",
+   "self_type" : "_ZTIb",
    "size" : 1
   },
   {
@@ -37,24 +37,24 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIc",
    "name" : "char",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIc",
    "size" : 1
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTId",
    "name" : "double",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
+   "referenced_type" : "_ZTId",
+   "self_type" : "_ZTId",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIf",
    "name" : "float",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
+   "referenced_type" : "_ZTIf",
+   "self_type" : "_ZTIf",
    "size" : 4
   },
   {
@@ -63,8 +63,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIh",
    "name" : "unsigned char",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIh",
    "size" : 1
   },
   {
@@ -72,8 +72,8 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIi",
    "name" : "int",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
+   "referenced_type" : "_ZTIi",
+   "self_type" : "_ZTIi",
    "size" : 4
   },
   {
@@ -82,8 +82,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIj",
    "name" : "unsigned int",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
+   "referenced_type" : "_ZTIj",
+   "self_type" : "_ZTIj",
    "size" : 4
   },
   {
@@ -91,8 +91,8 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIl",
    "name" : "long",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
+   "referenced_type" : "_ZTIl",
+   "self_type" : "_ZTIl",
    "size" : 8
   },
   {
@@ -101,8 +101,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIm",
    "name" : "unsigned long",
-   "referenced_type" : "type-628",
-   "self_type" : "type-628",
+   "referenced_type" : "_ZTIm",
+   "self_type" : "_ZTIm",
    "size" : 8
   },
   {
@@ -110,8 +110,8 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIs",
    "name" : "short",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "_ZTIs",
+   "self_type" : "_ZTIs",
    "size" : 2
   },
   {
@@ -120,15 +120,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIt",
    "name" : "unsigned short",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "_ZTIt",
+   "self_type" : "_ZTIt",
    "size" : 2
   },
   {
    "linker_set_key" : "_ZTIv",
    "name" : "void",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13"
+   "referenced_type" : "_ZTIv",
+   "self_type" : "_ZTIv"
   }
  ],
  "elf_functions" :
@@ -467,11 +467,11 @@
    ],
    "linker_set_key" : "_ZTI14jobjectRefType",
    "name" : "jobjectRefType",
-   "referenced_type" : "type-554",
-   "self_type" : "type-554",
+   "referenced_type" : "_ZTI14jobjectRefType",
+   "self_type" : "_ZTI14jobjectRefType",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h",
-   "underlying_type" : "type-555"
+   "underlying_type" : "_ZTIj"
   }
  ],
  "function_types" :
@@ -483,15 +483,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-553",
-   "return_type" : "type-554",
-   "self_type" : "type-553",
+   "referenced_type" : "_ZTIF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTI14jobjectRefType",
+   "self_type" : "_ZTIF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -501,15 +501,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-412",
-   "return_type" : "type-413",
-   "self_type" : "type-412",
+   "referenced_type" : "_ZTIFP10_jintArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP10_jintArray",
+   "self_type" : "_ZTIFP10_jintArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -519,21 +519,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-86",
-   "return_type" : "type-31",
-   "self_type" : "type-86",
+   "referenced_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
+   "return_type" : "_ZTIP10_jmethodID",
+   "self_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -543,15 +543,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-30",
-   "return_type" : "type-31",
-   "self_type" : "type-30",
+   "referenced_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIP10_jmethodID",
+   "self_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -561,15 +561,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-400",
-   "return_type" : "type-401",
-   "self_type" : "type-400",
+   "referenced_type" : "_ZTIFP11_jbyteArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP11_jbyteArray",
+   "self_type" : "_ZTIFP11_jbyteArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -579,15 +579,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-404",
-   "return_type" : "type-405",
-   "self_type" : "type-404",
+   "referenced_type" : "_ZTIFP11_jcharArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP11_jcharArray",
+   "self_type" : "_ZTIFP11_jcharArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -597,15 +597,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-416",
-   "return_type" : "type-417",
-   "self_type" : "type-416",
+   "referenced_type" : "_ZTIFP11_jlongArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP11_jlongArray",
+   "self_type" : "_ZTIFP11_jlongArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -615,12 +615,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     }
    ],
-   "referenced_type" : "type-53",
-   "return_type" : "type-48",
-   "self_type" : "type-53",
+   "referenced_type" : "_ZTIFP11_jthrowableP7_JNIEnvE",
+   "return_type" : "_ZTIP11_jthrowable",
+   "self_type" : "_ZTIFP11_jthrowableP7_JNIEnvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -630,15 +630,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-420",
-   "return_type" : "type-421",
-   "self_type" : "type-420",
+   "referenced_type" : "_ZTIFP12_jfloatArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP12_jfloatArray",
+   "self_type" : "_ZTIFP12_jfloatArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -648,15 +648,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-408",
-   "return_type" : "type-409",
-   "self_type" : "type-408",
+   "referenced_type" : "_ZTIFP12_jshortArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP12_jshortArray",
+   "self_type" : "_ZTIFP12_jshortArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -666,15 +666,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-424",
-   "return_type" : "type-425",
-   "self_type" : "type-424",
+   "referenced_type" : "_ZTIFP13_jdoubleArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP13_jdoubleArray",
+   "self_type" : "_ZTIFP13_jdoubleArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -684,21 +684,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-388",
-   "return_type" : "type-389",
-   "self_type" : "type-388",
+   "referenced_type" : "_ZTIFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
+   "return_type" : "_ZTIP13_jobjectArray",
+   "self_type" : "_ZTIFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -708,15 +708,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-396",
-   "return_type" : "type-397",
-   "self_type" : "type-396",
+   "referenced_type" : "_ZTIFP14_jbooleanArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP14_jbooleanArray",
+   "self_type" : "_ZTIFP14_jbooleanArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -726,15 +726,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-82",
-   "return_type" : "type-19",
-   "self_type" : "type-82",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIP7_jclass",
+   "self_type" : "_ZTIFP7_jclassP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -744,15 +744,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-28",
-   "return_type" : "type-19",
-   "self_type" : "type-28",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvPKcE",
+   "return_type" : "_ZTIP7_jclass",
+   "self_type" : "_ZTIFP7_jclassP7_JNIEnvPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -762,24 +762,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "_ZTIPKa"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-18",
-   "return_type" : "type-19",
-   "self_type" : "type-18",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
+   "return_type" : "_ZTIP7_jclass",
+   "self_type" : "_ZTIFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -789,15 +789,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-41",
-   "return_type" : "type-19",
-   "self_type" : "type-41",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvS0_E",
+   "return_type" : "_ZTIP7_jclass",
+   "self_type" : "_ZTIFP7_jclassP7_JNIEnvS0_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -807,18 +807,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-389"
+     "referenced_type" : "_ZTIP13_jobjectArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-392",
-   "return_type" : "type-5",
-   "self_type" : "type-392",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -828,15 +828,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-4",
-   "return_type" : "type-5",
-   "self_type" : "type-4",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -846,21 +846,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-72",
-   "return_type" : "type-5",
-   "self_type" : "type-72",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -870,21 +870,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-69",
-   "return_type" : "type-5",
-   "self_type" : "type-69",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -894,21 +894,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     }
    ],
-   "referenced_type" : "type-38",
-   "return_type" : "type-5",
-   "self_type" : "type-38",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -918,18 +918,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-67",
-   "return_type" : "type-5",
-   "self_type" : "type-67",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -939,18 +939,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-329",
-   "return_type" : "type-5",
-   "self_type" : "type-329",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -960,21 +960,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     }
    ],
-   "referenced_type" : "type-45",
-   "return_type" : "type-5",
-   "self_type" : "type-45",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -984,18 +984,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "_ZTIl"
     }
    ],
-   "referenced_type" : "type-547",
-   "return_type" : "type-5",
-   "self_type" : "type-547",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvPvlE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvPvlE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1005,15 +1005,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-61",
-   "return_type" : "type-5",
-   "self_type" : "type-61",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_E",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1023,21 +1023,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-93",
-   "return_type" : "type-5",
-   "self_type" : "type-93",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1047,21 +1047,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-91"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-90",
-   "return_type" : "type-5",
-   "self_type" : "type-90",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1071,18 +1071,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-88",
-   "return_type" : "type-5",
-   "self_type" : "type-88",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1092,24 +1092,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-163",
-   "return_type" : "type-5",
-   "self_type" : "type-163",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1119,24 +1119,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-161"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-160",
-   "return_type" : "type-5",
-   "self_type" : "type-160",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1146,21 +1146,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-158",
-   "return_type" : "type-5",
-   "self_type" : "type-158",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1170,18 +1170,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-230",
-   "return_type" : "type-5",
-   "self_type" : "type-230",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1191,15 +1191,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-378",
-   "return_type" : "type-366",
-   "self_type" : "type-378",
+   "referenced_type" : "_ZTIFP8_jstringP7_JNIEnvPKcE",
+   "return_type" : "_ZTIP8_jstring",
+   "self_type" : "_ZTIFP8_jstringP7_JNIEnvPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1209,18 +1209,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "_ZTIPKt"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-365",
-   "return_type" : "type-366",
-   "self_type" : "type-365",
+   "referenced_type" : "_ZTIFP8_jstringP7_JNIEnvPKtiE",
+   "return_type" : "_ZTIP8_jstring",
+   "self_type" : "_ZTIFP8_jstringP7_JNIEnvPKtiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1230,21 +1230,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-228",
-   "return_type" : "type-35",
-   "self_type" : "type-228",
+   "referenced_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
+   "return_type" : "_ZTIP9_jfieldID",
+   "self_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1254,15 +1254,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-34",
-   "return_type" : "type-35",
-   "self_type" : "type-34",
+   "referenced_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIP9_jfieldID",
+   "self_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1272,18 +1272,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-366"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-380",
-   "return_type" : "type-21",
-   "self_type" : "type-380",
+   "referenced_type" : "_ZTIFPKcP7_JNIEnvP8_jstringPhE",
+   "return_type" : "_ZTIPKc",
+   "self_type" : "_ZTIFPKcP7_JNIEnvP8_jstringPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1293,18 +1293,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-626"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-628"
+     "referenced_type" : "_ZTIm"
     },
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "_ZTIPi"
     }
    ],
-   "referenced_type" : "type-627",
-   "return_type" : "type-21",
-   "self_type" : "type-627",
+   "referenced_type" : "_ZTIFPKcPKvmPiE",
+   "return_type" : "_ZTIPKc",
+   "self_type" : "_ZTIFPKcPKvmPiE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1314,18 +1314,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-366"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-373",
-   "return_type" : "type-368",
-   "self_type" : "type-373",
+   "referenced_type" : "_ZTIFPKtP7_JNIEnvP8_jstringPhE",
+   "return_type" : "_ZTIPKt",
+   "self_type" : "_ZTIFPKtP7_JNIEnvP8_jstringPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1335,18 +1335,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-401"
+     "referenced_type" : "_ZTIP11_jbyteArray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-430",
-   "return_type" : "type-431",
-   "self_type" : "type-430",
+   "referenced_type" : "_ZTIFPaP7_JNIEnvP11_jbyteArrayPhE",
+   "return_type" : "_ZTIPa",
+   "self_type" : "_ZTIFPaP7_JNIEnvP11_jbyteArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1356,18 +1356,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-425"
+     "referenced_type" : "_ZTIP13_jdoubleArray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-448",
-   "return_type" : "type-449",
-   "self_type" : "type-448",
+   "referenced_type" : "_ZTIFPdP7_JNIEnvP13_jdoubleArrayPhE",
+   "return_type" : "_ZTIPd",
+   "self_type" : "_ZTIFPdP7_JNIEnvP13_jdoubleArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1377,18 +1377,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-421"
+     "referenced_type" : "_ZTIP12_jfloatArray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-445",
-   "return_type" : "type-446",
-   "self_type" : "type-445",
+   "referenced_type" : "_ZTIFPfP7_JNIEnvP12_jfloatArrayPhE",
+   "return_type" : "_ZTIPf",
+   "self_type" : "_ZTIFPfP7_JNIEnvP12_jfloatArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1398,18 +1398,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "_ZTIP14_jbooleanArray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-428",
-   "return_type" : "type-374",
-   "self_type" : "type-428",
+   "referenced_type" : "_ZTIFPhP7_JNIEnvP14_jbooleanArrayS_E",
+   "return_type" : "_ZTIPh",
+   "self_type" : "_ZTIFPhP7_JNIEnvP14_jbooleanArrayS_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1419,18 +1419,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "_ZTIP10_jintArray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-439",
-   "return_type" : "type-440",
-   "self_type" : "type-439",
+   "referenced_type" : "_ZTIFPiP7_JNIEnvP10_jintArrayPhE",
+   "return_type" : "_ZTIPi",
+   "self_type" : "_ZTIFPiP7_JNIEnvP10_jintArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1440,18 +1440,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-417"
+     "referenced_type" : "_ZTIP11_jlongArray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-442",
-   "return_type" : "type-443",
-   "self_type" : "type-442",
+   "referenced_type" : "_ZTIFPlP7_JNIEnvP11_jlongArrayPhE",
+   "return_type" : "_ZTIPl",
+   "self_type" : "_ZTIFPlP7_JNIEnvP11_jlongArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1461,18 +1461,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-409"
+     "referenced_type" : "_ZTIP12_jshortArray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-436",
-   "return_type" : "type-437",
-   "self_type" : "type-436",
+   "referenced_type" : "_ZTIFPsP7_JNIEnvP12_jshortArrayPhE",
+   "return_type" : "_ZTIPs",
+   "self_type" : "_ZTIFPsP7_JNIEnvP12_jshortArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1482,18 +1482,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "_ZTIP11_jcharArray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-433",
-   "return_type" : "type-434",
-   "self_type" : "type-433",
+   "referenced_type" : "_ZTIFPtP7_JNIEnvP11_jcharArrayPhE",
+   "return_type" : "_ZTIPt",
+   "self_type" : "_ZTIFPtP7_JNIEnvP11_jcharArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1503,18 +1503,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "_ZTIP7_jarray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-541",
-   "return_type" : "type-12",
-   "self_type" : "type-541",
+   "referenced_type" : "_ZTIFPvP7_JNIEnvP7_jarrayPhE",
+   "return_type" : "_ZTIPv",
+   "self_type" : "_ZTIFPvP7_JNIEnvP7_jarrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1524,15 +1524,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-549",
-   "return_type" : "type-12",
-   "self_type" : "type-549",
+   "referenced_type" : "_ZTIFPvP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIPv",
+   "self_type" : "_ZTIFPvP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1542,12 +1542,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "referenced_type" : "type-607",
-   "return_type" : "type-12",
-   "self_type" : "type-607",
+   "referenced_type" : "_ZTIFPvS_E",
+   "return_type" : "_ZTIPv",
+   "self_type" : "_ZTIFPvS_E",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -1557,21 +1557,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-278",
-   "return_type" : "type-26",
-   "self_type" : "type-278",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1581,21 +1581,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-276"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-275",
-   "return_type" : "type-26",
-   "self_type" : "type-275",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1605,18 +1605,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-273",
-   "return_type" : "type-26",
-   "self_type" : "type-273",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1626,18 +1626,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-333",
-   "return_type" : "type-26",
-   "self_type" : "type-333",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1647,21 +1647,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-107",
-   "return_type" : "type-26",
-   "self_type" : "type-107",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1671,21 +1671,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-104",
-   "return_type" : "type-26",
-   "self_type" : "type-104",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1695,18 +1695,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-102",
-   "return_type" : "type-26",
-   "self_type" : "type-102",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1716,24 +1716,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-177",
-   "return_type" : "type-26",
-   "self_type" : "type-177",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1743,24 +1743,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-175"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-174",
-   "return_type" : "type-26",
-   "self_type" : "type-174",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1770,21 +1770,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-172",
-   "return_type" : "type-26",
-   "self_type" : "type-172",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1794,18 +1794,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-234",
-   "return_type" : "type-26",
-   "self_type" : "type-234",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1815,15 +1815,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-626"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-628"
+     "referenced_type" : "_ZTIm"
     }
    ],
-   "referenced_type" : "type-652",
-   "return_type" : "type-596",
-   "self_type" : "type-652",
+   "referenced_type" : "_ZTIFbPKvmE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPKvmE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1833,15 +1833,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-632",
-   "return_type" : "type-596",
-   "self_type" : "type-632",
+   "referenced_type" : "_ZTIFbPviE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1851,18 +1851,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-680"
+     "referenced_type" : "_ZTIPPDs"
     }
    ],
-   "referenced_type" : "type-679",
-   "return_type" : "type-596",
-   "self_type" : "type-679",
+   "referenced_type" : "_ZTIFbPviPPDsE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPDsE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1872,18 +1872,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-683"
+     "referenced_type" : "_ZTIPPa"
     }
    ],
-   "referenced_type" : "type-682",
-   "return_type" : "type-596",
-   "self_type" : "type-682",
+   "referenced_type" : "_ZTIFbPviPPaE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPaE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1893,18 +1893,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-623"
+     "referenced_type" : "_ZTIPPc"
     }
    ],
-   "referenced_type" : "type-622",
-   "return_type" : "type-596",
-   "self_type" : "type-622",
+   "referenced_type" : "_ZTIFbPviPPcE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPcE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1914,18 +1914,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-674"
+     "referenced_type" : "_ZTIPPd"
     }
    ],
-   "referenced_type" : "type-673",
-   "return_type" : "type-596",
-   "self_type" : "type-673",
+   "referenced_type" : "_ZTIFbPviPPdE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPdE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1935,18 +1935,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-671"
+     "referenced_type" : "_ZTIPPf"
     }
    ],
-   "referenced_type" : "type-670",
-   "return_type" : "type-596",
-   "self_type" : "type-670",
+   "referenced_type" : "_ZTIFbPviPPfE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPfE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1956,18 +1956,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-657"
+     "referenced_type" : "_ZTIPPi"
     }
    ],
-   "referenced_type" : "type-656",
-   "return_type" : "type-596",
-   "self_type" : "type-656",
+   "referenced_type" : "_ZTIFbPviPPiE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPiE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1977,18 +1977,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-660"
+     "referenced_type" : "_ZTIPPj"
     }
    ],
-   "referenced_type" : "type-659",
-   "return_type" : "type-596",
-   "self_type" : "type-659",
+   "referenced_type" : "_ZTIFbPviPPjE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPjE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1998,18 +1998,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-663"
+     "referenced_type" : "_ZTIPPl"
     }
    ],
-   "referenced_type" : "type-662",
-   "return_type" : "type-596",
-   "self_type" : "type-662",
+   "referenced_type" : "_ZTIFbPviPPlE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPlE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -2019,18 +2019,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-666"
+     "referenced_type" : "_ZTIPPm"
     }
    ],
-   "referenced_type" : "type-665",
-   "return_type" : "type-596",
-   "self_type" : "type-665",
+   "referenced_type" : "_ZTIFbPviPPmE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPmE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -2040,21 +2040,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-628"
+     "referenced_type" : "_ZTIm"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-623"
+     "referenced_type" : "_ZTIPPc"
     }
    ],
-   "referenced_type" : "type-634",
-   "return_type" : "type-596",
-   "self_type" : "type-634",
+   "referenced_type" : "_ZTIFbPvmiPPcE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPvmiPPcE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -2064,21 +2064,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-320",
-   "return_type" : "type-80",
-   "self_type" : "type-320",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2088,21 +2088,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-318"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-317",
-   "return_type" : "type-80",
-   "self_type" : "type-317",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2112,18 +2112,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-315",
-   "return_type" : "type-80",
-   "self_type" : "type-315",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2133,18 +2133,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-345",
-   "return_type" : "type-80",
-   "self_type" : "type-345",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2154,21 +2154,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-149",
-   "return_type" : "type-80",
-   "self_type" : "type-149",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2178,21 +2178,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-146",
-   "return_type" : "type-80",
-   "self_type" : "type-146",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2202,18 +2202,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-144",
-   "return_type" : "type-80",
-   "self_type" : "type-144",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2223,24 +2223,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-219",
-   "return_type" : "type-80",
-   "self_type" : "type-219",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2250,24 +2250,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-216",
-   "return_type" : "type-80",
-   "self_type" : "type-216",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2277,21 +2277,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-214",
-   "return_type" : "type-80",
-   "self_type" : "type-214",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2301,18 +2301,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-246",
-   "return_type" : "type-80",
-   "self_type" : "type-246",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2322,21 +2322,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-313",
-   "return_type" : "type-79",
-   "self_type" : "type-313",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2346,21 +2346,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-311"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-310",
-   "return_type" : "type-79",
-   "self_type" : "type-310",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2370,18 +2370,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-308",
-   "return_type" : "type-79",
-   "self_type" : "type-308",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2391,18 +2391,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-343",
-   "return_type" : "type-79",
-   "self_type" : "type-343",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2412,21 +2412,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-142",
-   "return_type" : "type-79",
-   "self_type" : "type-142",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2436,21 +2436,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-139",
-   "return_type" : "type-79",
-   "self_type" : "type-139",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2460,18 +2460,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-137",
-   "return_type" : "type-79",
-   "self_type" : "type-137",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2481,24 +2481,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-212",
-   "return_type" : "type-79",
-   "self_type" : "type-212",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2508,24 +2508,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-210"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-209",
-   "return_type" : "type-79",
-   "self_type" : "type-209",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2535,21 +2535,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-207",
-   "return_type" : "type-79",
-   "self_type" : "type-207",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2559,18 +2559,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-244",
-   "return_type" : "type-79",
-   "self_type" : "type-244",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2580,12 +2580,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     }
    ],
-   "referenced_type" : "type-545",
-   "return_type" : "type-39",
-   "self_type" : "type-545",
+   "referenced_type" : "_ZTIFhP7_JNIEnvE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2595,21 +2595,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-271",
-   "return_type" : "type-39",
-   "self_type" : "type-271",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2619,21 +2619,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-269"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-268",
-   "return_type" : "type-39",
-   "self_type" : "type-268",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2643,18 +2643,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-266",
-   "return_type" : "type-39",
-   "self_type" : "type-266",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2664,18 +2664,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-331",
-   "return_type" : "type-39",
-   "self_type" : "type-331",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2685,18 +2685,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-43",
-   "return_type" : "type-39",
-   "self_type" : "type-43",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassS2_E",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassS2_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2706,21 +2706,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-100",
-   "return_type" : "type-39",
-   "self_type" : "type-100",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2730,21 +2730,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-98"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-97",
-   "return_type" : "type-39",
-   "self_type" : "type-97",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2754,18 +2754,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-95",
-   "return_type" : "type-39",
-   "self_type" : "type-95",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2775,18 +2775,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-84",
-   "return_type" : "type-39",
-   "self_type" : "type-84",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2796,24 +2796,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-170",
-   "return_type" : "type-39",
-   "self_type" : "type-170",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2823,24 +2823,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-168"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-167",
-   "return_type" : "type-39",
-   "self_type" : "type-167",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2850,21 +2850,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-165",
-   "return_type" : "type-39",
-   "self_type" : "type-165",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2874,18 +2874,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-232",
-   "return_type" : "type-39",
-   "self_type" : "type-232",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2895,18 +2895,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-65",
-   "return_type" : "type-39",
-   "self_type" : "type-65",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectS2_E",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectS2_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2916,18 +2916,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-626"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-628"
+     "referenced_type" : "_ZTIm"
     }
    ],
-   "referenced_type" : "type-636",
-   "return_type" : "type-16",
-   "self_type" : "type-636",
+   "referenced_type" : "_ZTIFiP7AParcelPKvmE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7AParcelPKvmE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -2937,12 +2937,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     }
    ],
-   "referenced_type" : "type-15",
-   "return_type" : "type-16",
-   "self_type" : "type-15",
+   "referenced_type" : "_ZTIFiP7_JNIEnvE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2952,15 +2952,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "_ZTIP11_jthrowable"
     }
    ],
-   "referenced_type" : "type-47",
-   "return_type" : "type-16",
-   "self_type" : "type-47",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP11_jthrowableE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP11_jthrowableE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2970,15 +2970,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "_ZTIP7_jarray"
     }
    ],
-   "referenced_type" : "type-384",
-   "return_type" : "type-16",
-   "self_type" : "type-384",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jarrayE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jarrayE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2988,15 +2988,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-516",
-   "return_type" : "type-16",
-   "self_type" : "type-516",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3006,21 +3006,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-299",
-   "return_type" : "type-16",
-   "self_type" : "type-299",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3030,21 +3030,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-297"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-296",
-   "return_type" : "type-16",
-   "self_type" : "type-296",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3054,18 +3054,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-294",
-   "return_type" : "type-16",
-   "self_type" : "type-294",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3075,18 +3075,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-339",
-   "return_type" : "type-16",
-   "self_type" : "type-339",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3096,21 +3096,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-512"
+     "referenced_type" : "_ZTIPK15JNINativeMethod"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-511",
-   "return_type" : "type-16",
-   "self_type" : "type-511",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3120,18 +3120,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-51",
-   "return_type" : "type-16",
-   "self_type" : "type-51",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassPKcE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3141,15 +3141,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-518",
-   "return_type" : "type-16",
-   "self_type" : "type-518",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3159,21 +3159,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-128",
-   "return_type" : "type-16",
-   "self_type" : "type-128",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3183,21 +3183,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-126"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-125",
-   "return_type" : "type-16",
-   "self_type" : "type-125",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3207,18 +3207,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-123",
-   "return_type" : "type-16",
-   "self_type" : "type-123",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3228,24 +3228,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-198",
-   "return_type" : "type-16",
-   "self_type" : "type-198",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3255,24 +3255,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-196"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-195",
-   "return_type" : "type-16",
-   "self_type" : "type-195",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3282,21 +3282,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-193",
-   "return_type" : "type-16",
-   "self_type" : "type-193",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3306,18 +3306,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-240",
-   "return_type" : "type-16",
-   "self_type" : "type-240",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3327,15 +3327,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-366"
+     "referenced_type" : "_ZTIP8_jstring"
     }
    ],
-   "referenced_type" : "type-371",
-   "return_type" : "type-16",
-   "self_type" : "type-371",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jstringE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jstringE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3345,15 +3345,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-521"
+     "referenced_type" : "_ZTIPP7_JavaVM"
     }
    ],
-   "referenced_type" : "type-520",
-   "return_type" : "type-16",
-   "self_type" : "type-520",
+   "referenced_type" : "_ZTIFiP7_JNIEnvPP7_JavaVME",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvPP7_JavaVME",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3363,15 +3363,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-59",
-   "return_type" : "type-16",
-   "self_type" : "type-59",
+   "referenced_type" : "_ZTIFiP7_JNIEnviE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3381,12 +3381,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-522"
+     "referenced_type" : "_ZTIP7_JavaVM"
     }
    ],
-   "referenced_type" : "type-528",
-   "return_type" : "type-16",
-   "self_type" : "type-528",
+   "referenced_type" : "_ZTIFiP7_JavaVME",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JavaVME",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3396,18 +3396,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-522"
+     "referenced_type" : "_ZTIP7_JavaVM"
     },
     {
-     "referenced_type" : "type-531"
+     "referenced_type" : "_ZTIPP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "referenced_type" : "type-530",
-   "return_type" : "type-16",
-   "self_type" : "type-530",
+   "referenced_type" : "_ZTIFiP7_JavaVMPP7_JNIEnvPvE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JavaVMPP7_JNIEnvPvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3417,18 +3417,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-522"
+     "referenced_type" : "_ZTIP7_JavaVM"
     },
     {
-     "referenced_type" : "type-534"
+     "referenced_type" : "_ZTIPPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-533",
-   "return_type" : "type-16",
-   "self_type" : "type-533",
+   "referenced_type" : "_ZTIFiP7_JavaVMPPviE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JavaVMPPviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3438,21 +3438,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIPPKc"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "referenced_type" : "type-590",
-   "return_type" : "type-16",
-   "self_type" : "type-590",
+   "referenced_type" : "_ZTIFiP8AIBinderiPPKcjE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP8AIBinderiPPKcjE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -3462,21 +3462,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "_ZTIP7AParcel"
     }
    ],
-   "referenced_type" : "type-587",
-   "return_type" : "type-16",
-   "self_type" : "type-587",
+   "referenced_type" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -3486,18 +3486,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-628"
+     "referenced_type" : "_ZTIm"
     }
    ],
-   "referenced_type" : "type-638",
-   "return_type" : "type-16",
-   "self_type" : "type-638",
+   "referenced_type" : "_ZTIFiPK7AParcelPvmE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiPK7AParcelPvmE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -3507,21 +3507,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-306",
-   "return_type" : "type-78",
-   "self_type" : "type-306",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIl",
+   "self_type" : "_ZTIFlP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3531,21 +3531,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-304"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-303",
-   "return_type" : "type-78",
-   "self_type" : "type-303",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIl",
+   "self_type" : "_ZTIFlP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3555,18 +3555,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-301",
-   "return_type" : "type-78",
-   "self_type" : "type-301",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIl",
+   "self_type" : "_ZTIFlP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3576,18 +3576,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-341",
-   "return_type" : "type-78",
-   "self_type" : "type-341",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIl",
+   "self_type" : "_ZTIFlP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3597,15 +3597,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-551",
-   "return_type" : "type-78",
-   "self_type" : "type-551",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIl",
+   "self_type" : "_ZTIFlP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3615,21 +3615,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-135",
-   "return_type" : "type-78",
-   "self_type" : "type-135",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIl",
+   "self_type" : "_ZTIFlP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3639,21 +3639,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-133"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-132",
-   "return_type" : "type-78",
-   "self_type" : "type-132",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIl",
+   "self_type" : "_ZTIFlP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3663,18 +3663,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-130",
-   "return_type" : "type-78",
-   "self_type" : "type-130",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIl",
+   "self_type" : "_ZTIFlP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3684,24 +3684,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-205",
-   "return_type" : "type-78",
-   "self_type" : "type-205",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIl",
+   "self_type" : "_ZTIFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3711,24 +3711,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-203"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-202",
-   "return_type" : "type-78",
-   "self_type" : "type-202",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIl",
+   "self_type" : "_ZTIFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3738,21 +3738,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-200",
-   "return_type" : "type-78",
-   "self_type" : "type-200",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIl",
+   "self_type" : "_ZTIFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3762,18 +3762,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-242",
-   "return_type" : "type-78",
-   "self_type" : "type-242",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIl",
+   "self_type" : "_ZTIFlP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3783,21 +3783,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-292",
-   "return_type" : "type-77",
-   "self_type" : "type-292",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3807,21 +3807,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-290"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-289",
-   "return_type" : "type-77",
-   "self_type" : "type-289",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3831,18 +3831,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-287",
-   "return_type" : "type-77",
-   "self_type" : "type-287",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3852,18 +3852,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-337",
-   "return_type" : "type-77",
-   "self_type" : "type-337",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3873,21 +3873,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-121",
-   "return_type" : "type-77",
-   "self_type" : "type-121",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3897,21 +3897,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-118",
-   "return_type" : "type-77",
-   "self_type" : "type-118",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3921,18 +3921,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-116",
-   "return_type" : "type-77",
-   "self_type" : "type-116",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3942,24 +3942,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-191",
-   "return_type" : "type-77",
-   "self_type" : "type-191",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3969,24 +3969,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-189"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-188",
-   "return_type" : "type-77",
-   "self_type" : "type-188",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3996,21 +3996,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-186",
-   "return_type" : "type-77",
-   "self_type" : "type-186",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4020,18 +4020,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-238",
-   "return_type" : "type-77",
-   "self_type" : "type-238",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4041,21 +4041,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-285",
-   "return_type" : "type-76",
-   "self_type" : "type-285",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4065,21 +4065,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-283"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-282",
-   "return_type" : "type-76",
-   "self_type" : "type-282",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4089,18 +4089,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-280",
-   "return_type" : "type-76",
-   "self_type" : "type-280",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4110,18 +4110,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-335",
-   "return_type" : "type-76",
-   "self_type" : "type-335",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4131,21 +4131,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-114",
-   "return_type" : "type-76",
-   "self_type" : "type-114",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4155,21 +4155,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-112"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-111",
-   "return_type" : "type-76",
-   "self_type" : "type-111",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4179,18 +4179,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-109",
-   "return_type" : "type-76",
-   "self_type" : "type-109",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4200,24 +4200,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-184",
-   "return_type" : "type-76",
-   "self_type" : "type-184",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4227,24 +4227,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-182"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-181",
-   "return_type" : "type-76",
-   "self_type" : "type-181",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4254,21 +4254,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-179",
-   "return_type" : "type-76",
-   "self_type" : "type-179",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4278,18 +4278,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-236",
-   "return_type" : "type-76",
-   "self_type" : "type-236",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4299,12 +4299,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     }
    ],
-   "referenced_type" : "type-55",
-   "return_type" : "type-13",
-   "self_type" : "type-55",
+   "referenced_type" : "_ZTIFvP7_JNIEnvE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4314,21 +4314,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "_ZTIP10_jintArray"
     },
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "_ZTIPi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-459",
-   "return_type" : "type-13",
-   "self_type" : "type-459",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayPiiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP10_jintArrayPiiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4338,24 +4338,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "_ZTIP10_jintArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-496"
+     "referenced_type" : "_ZTIPKi"
     }
    ],
-   "referenced_type" : "type-495",
-   "return_type" : "type-13",
-   "self_type" : "type-495",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPKiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPKiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4365,24 +4365,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "_ZTIP10_jintArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "_ZTIPi"
     }
    ],
-   "referenced_type" : "type-475",
-   "return_type" : "type-13",
-   "self_type" : "type-475",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4392,21 +4392,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-401"
+     "referenced_type" : "_ZTIP11_jbyteArray"
     },
     {
-     "referenced_type" : "type-431"
+     "referenced_type" : "_ZTIPa"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-453",
-   "return_type" : "type-13",
-   "self_type" : "type-453",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayPaiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayPaiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4416,24 +4416,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-401"
+     "referenced_type" : "_ZTIP11_jbyteArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "_ZTIPKa"
     }
    ],
-   "referenced_type" : "type-487",
-   "return_type" : "type-13",
-   "self_type" : "type-487",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPKaE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPKaE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4443,24 +4443,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-401"
+     "referenced_type" : "_ZTIP11_jbyteArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-431"
+     "referenced_type" : "_ZTIPa"
     }
    ],
-   "referenced_type" : "type-469",
-   "return_type" : "type-13",
-   "self_type" : "type-469",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPaE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPaE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4470,21 +4470,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "_ZTIP11_jcharArray"
     },
     {
-     "referenced_type" : "type-434"
+     "referenced_type" : "_ZTIPt"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-455",
-   "return_type" : "type-13",
-   "self_type" : "type-455",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayPtiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayPtiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4494,24 +4494,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "_ZTIP11_jcharArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "_ZTIPKt"
     }
    ],
-   "referenced_type" : "type-489",
-   "return_type" : "type-13",
-   "self_type" : "type-489",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPKtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPKtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4521,24 +4521,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "_ZTIP11_jcharArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-434"
+     "referenced_type" : "_ZTIPt"
     }
    ],
-   "referenced_type" : "type-471",
-   "return_type" : "type-13",
-   "self_type" : "type-471",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4548,21 +4548,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-417"
+     "referenced_type" : "_ZTIP11_jlongArray"
     },
     {
-     "referenced_type" : "type-443"
+     "referenced_type" : "_ZTIPl"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-461",
-   "return_type" : "type-13",
-   "self_type" : "type-461",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayPliE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayPliE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4572,24 +4572,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-417"
+     "referenced_type" : "_ZTIP11_jlongArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-500"
+     "referenced_type" : "_ZTIPKl"
     }
    ],
-   "referenced_type" : "type-499",
-   "return_type" : "type-13",
-   "self_type" : "type-499",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPKlE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPKlE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4599,24 +4599,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-417"
+     "referenced_type" : "_ZTIP11_jlongArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-443"
+     "referenced_type" : "_ZTIPl"
     }
    ],
-   "referenced_type" : "type-477",
-   "return_type" : "type-13",
-   "self_type" : "type-477",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPlE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPlE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4626,21 +4626,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-421"
+     "referenced_type" : "_ZTIP12_jfloatArray"
     },
     {
-     "referenced_type" : "type-446"
+     "referenced_type" : "_ZTIPf"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-463",
-   "return_type" : "type-13",
-   "self_type" : "type-463",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayPfiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayPfiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4650,24 +4650,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-421"
+     "referenced_type" : "_ZTIP12_jfloatArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-504"
+     "referenced_type" : "_ZTIPKf"
     }
    ],
-   "referenced_type" : "type-503",
-   "return_type" : "type-13",
-   "self_type" : "type-503",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPKfE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPKfE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4677,24 +4677,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-421"
+     "referenced_type" : "_ZTIP12_jfloatArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-446"
+     "referenced_type" : "_ZTIPf"
     }
    ],
-   "referenced_type" : "type-479",
-   "return_type" : "type-13",
-   "self_type" : "type-479",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPfE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPfE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4704,21 +4704,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-409"
+     "referenced_type" : "_ZTIP12_jshortArray"
     },
     {
-     "referenced_type" : "type-437"
+     "referenced_type" : "_ZTIPs"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-457",
-   "return_type" : "type-13",
-   "self_type" : "type-457",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayPsiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayPsiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4728,24 +4728,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-409"
+     "referenced_type" : "_ZTIP12_jshortArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-492"
+     "referenced_type" : "_ZTIPKs"
     }
    ],
-   "referenced_type" : "type-491",
-   "return_type" : "type-13",
-   "self_type" : "type-491",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPKsE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPKsE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4755,24 +4755,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-409"
+     "referenced_type" : "_ZTIP12_jshortArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-437"
+     "referenced_type" : "_ZTIPs"
     }
    ],
-   "referenced_type" : "type-473",
-   "return_type" : "type-13",
-   "self_type" : "type-473",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPsE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPsE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4782,21 +4782,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-425"
+     "referenced_type" : "_ZTIP13_jdoubleArray"
     },
     {
-     "referenced_type" : "type-449"
+     "referenced_type" : "_ZTIPd"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-465",
-   "return_type" : "type-13",
-   "self_type" : "type-465",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayPdiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayPdiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4806,24 +4806,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-425"
+     "referenced_type" : "_ZTIP13_jdoubleArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-508"
+     "referenced_type" : "_ZTIPKd"
     }
    ],
-   "referenced_type" : "type-507",
-   "return_type" : "type-13",
-   "self_type" : "type-507",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4833,24 +4833,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-425"
+     "referenced_type" : "_ZTIP13_jdoubleArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-449"
+     "referenced_type" : "_ZTIPd"
     }
    ],
-   "referenced_type" : "type-481",
-   "return_type" : "type-13",
-   "self_type" : "type-481",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPdE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPdE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4860,21 +4860,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-389"
+     "referenced_type" : "_ZTIP13_jobjectArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-394",
-   "return_type" : "type-13",
-   "self_type" : "type-394",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4884,21 +4884,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "_ZTIP14_jbooleanArray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-451",
-   "return_type" : "type-13",
-   "self_type" : "type-451",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayPhiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayPhiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4908,24 +4908,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "_ZTIP14_jbooleanArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "_ZTIPKh"
     }
    ],
-   "referenced_type" : "type-483",
-   "return_type" : "type-13",
-   "self_type" : "type-483",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4935,24 +4935,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "_ZTIP14_jbooleanArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-467",
-   "return_type" : "type-13",
-   "self_type" : "type-467",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPhE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4962,21 +4962,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "_ZTIP7_jarray"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-543",
-   "return_type" : "type-13",
-   "self_type" : "type-543",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jarrayPviE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jarrayPviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4986,21 +4986,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-327",
-   "return_type" : "type-13",
-   "self_type" : "type-327",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5010,21 +5010,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-325"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-324",
-   "return_type" : "type-13",
-   "self_type" : "type-324",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5034,18 +5034,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-322",
-   "return_type" : "type-13",
-   "self_type" : "type-322",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5055,21 +5055,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-347",
-   "return_type" : "type-13",
-   "self_type" : "type-347",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5079,21 +5079,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-26"
+     "referenced_type" : "_ZTIa"
     }
    ],
-   "referenced_type" : "type-351",
-   "return_type" : "type-13",
-   "self_type" : "type-351",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5103,21 +5103,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "_ZTId"
     }
    ],
-   "referenced_type" : "type-363",
-   "return_type" : "type-13",
-   "self_type" : "type-363",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5127,21 +5127,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-79"
+     "referenced_type" : "_ZTIf"
     }
    ],
-   "referenced_type" : "type-361",
-   "return_type" : "type-13",
-   "self_type" : "type-361",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5151,21 +5151,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     }
    ],
-   "referenced_type" : "type-349",
-   "return_type" : "type-13",
-   "self_type" : "type-349",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5175,21 +5175,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-357",
-   "return_type" : "type-13",
-   "self_type" : "type-357",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5199,21 +5199,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "_ZTIl"
     }
    ],
-   "referenced_type" : "type-359",
-   "return_type" : "type-13",
-   "self_type" : "type-359",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDlE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDlE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5223,21 +5223,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-77"
+     "referenced_type" : "_ZTIs"
     }
    ],
-   "referenced_type" : "type-355",
-   "return_type" : "type-13",
-   "self_type" : "type-355",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5247,21 +5247,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "_ZTIt"
     }
    ],
-   "referenced_type" : "type-353",
-   "return_type" : "type-13",
-   "self_type" : "type-353",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5271,15 +5271,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-63",
-   "return_type" : "type-13",
-   "self_type" : "type-63",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5289,21 +5289,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-156",
-   "return_type" : "type-13",
-   "self_type" : "type-156",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5313,21 +5313,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-153",
-   "return_type" : "type-13",
-   "self_type" : "type-153",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5337,18 +5337,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-151",
-   "return_type" : "type-13",
-   "self_type" : "type-151",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5358,24 +5358,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-226",
-   "return_type" : "type-13",
-   "self_type" : "type-226",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5385,24 +5385,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-224"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-223",
-   "return_type" : "type-13",
-   "self_type" : "type-223",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5412,21 +5412,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-221",
-   "return_type" : "type-13",
-   "self_type" : "type-221",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5436,21 +5436,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-248",
-   "return_type" : "type-13",
-   "self_type" : "type-248",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5460,21 +5460,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-26"
+     "referenced_type" : "_ZTIa"
     }
    ],
-   "referenced_type" : "type-252",
-   "return_type" : "type-13",
-   "self_type" : "type-252",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5484,21 +5484,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "_ZTId"
     }
    ],
-   "referenced_type" : "type-264",
-   "return_type" : "type-13",
-   "self_type" : "type-264",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5508,21 +5508,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-79"
+     "referenced_type" : "_ZTIf"
     }
    ],
-   "referenced_type" : "type-262",
-   "return_type" : "type-13",
-   "self_type" : "type-262",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5532,21 +5532,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     }
    ],
-   "referenced_type" : "type-250",
-   "return_type" : "type-13",
-   "self_type" : "type-250",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5556,21 +5556,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-258",
-   "return_type" : "type-13",
-   "self_type" : "type-258",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5580,21 +5580,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "_ZTIl"
     }
    ],
-   "referenced_type" : "type-260",
-   "return_type" : "type-13",
-   "self_type" : "type-260",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDlE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDlE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5604,21 +5604,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-77"
+     "referenced_type" : "_ZTIs"
     }
    ],
-   "referenced_type" : "type-256",
-   "return_type" : "type-13",
-   "self_type" : "type-256",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5628,21 +5628,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "_ZTIt"
     }
    ],
-   "referenced_type" : "type-254",
-   "return_type" : "type-13",
-   "self_type" : "type-254",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5652,18 +5652,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-366"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-382",
-   "return_type" : "type-13",
-   "self_type" : "type-382",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringPKcE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jstringPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5673,18 +5673,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-366"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "_ZTIPKt"
     }
    ],
-   "referenced_type" : "type-376",
-   "return_type" : "type-13",
-   "self_type" : "type-376",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringPKtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jstringPKtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5694,24 +5694,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-366"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-539"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-538",
-   "return_type" : "type-13",
-   "self_type" : "type-538",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPcE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5721,24 +5721,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-366"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-434"
+     "referenced_type" : "_ZTIPt"
     }
    ],
-   "referenced_type" : "type-536",
-   "return_type" : "type-13",
-   "self_type" : "type-536",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5748,15 +5748,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-57",
-   "return_type" : "type-13",
-   "self_type" : "type-57",
+   "referenced_type" : "_ZTIFvP7_JNIEnvPKcE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5766,12 +5766,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "referenced_type" : "type-599",
-   "return_type" : "type-13",
-   "self_type" : "type-599",
+   "referenced_type" : "_ZTIFvPvE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvPvE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5781,18 +5781,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-628"
+     "referenced_type" : "_ZTIm"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "_ZTIb"
     }
    ],
-   "referenced_type" : "type-676",
-   "return_type" : "type-13",
-   "self_type" : "type-676",
+   "referenced_type" : "_ZTIFvPvmbE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvPvmbE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   }
  ],
@@ -5801,7 +5801,7 @@
   {
    "function_name" : "ABinderProcess_joinThreadPool",
    "linker_set_key" : "ABinderProcess_joinThreadPool",
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_process.h"
   },
   {
@@ -5810,16 +5810,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "type-596",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_process.h"
   },
   {
    "function_name" : "ABinderProcess_startThreadPool",
    "linker_set_key" : "ABinderProcess_startThreadPool",
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_process.h"
   },
   {
@@ -5828,19 +5828,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-608"
+     "referenced_type" : "_ZTIPFPvS_E"
     },
     {
-     "referenced_type" : "type-615"
+     "referenced_type" : "_ZTIPFvPvE"
     },
     {
-     "referenced_type" : "type-586"
+     "referenced_type" : "_ZTIPFiP8AIBinderjPK7AParcelPS1_E"
     }
    ],
-   "return_type" : "type-1",
+   "return_type" : "_ZTIP14AIBinder_Class",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5849,13 +5849,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1"
+     "referenced_type" : "_ZTIP14AIBinder_Class"
     },
     {
-     "referenced_type" : "type-592"
+     "referenced_type" : "_ZTIPFiP8AIBinderiPPKcjE"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5864,10 +5864,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-601"
+     "referenced_type" : "_ZTIP23AIBinder_DeathRecipient"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5876,10 +5876,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-615"
+     "referenced_type" : "_ZTIPFvPvE"
     }
    ],
-   "return_type" : "type-601",
+   "return_type" : "_ZTIP23AIBinder_DeathRecipient",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5888,10 +5888,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-604"
+     "referenced_type" : "_ZTIP13AIBinder_Weak"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5900,10 +5900,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-604",
+   "return_type" : "_ZTIP13AIBinder_Weak",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5912,10 +5912,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-604"
+     "referenced_type" : "_ZTIP13AIBinder_Weak"
     }
    ],
-   "return_type" : "type-588",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5924,13 +5924,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-595"
+     "referenced_type" : "_ZTIPK14AIBinder_Class"
     }
    ],
-   "return_type" : "type-596",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5939,10 +5939,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5951,10 +5951,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5963,19 +5963,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIPPKc"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5984,25 +5984,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "type-613",
+   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder_jni.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
   },
   {
    "function_name" : "AIBinder_getCallingPid",
    "linker_set_key" : "AIBinder_getCallingPid",
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
    "function_name" : "AIBinder_getCallingUid",
    "linker_set_key" : "AIBinder_getCallingUid",
-   "return_type" : "type-555",
+   "return_type" : "_ZTIj",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6011,10 +6011,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-595",
+   "return_type" : "_ZTIPK14AIBinder_Class",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6023,13 +6023,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "_ZTIPP8AIBinder"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6038,10 +6038,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "_ZTIPv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6050,10 +6050,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6062,10 +6062,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK8AIBinder"
     }
    ],
-   "return_type" : "type-596",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6074,10 +6074,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK8AIBinder"
     }
    ],
-   "return_type" : "type-596",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6086,16 +6086,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-601"
+     "referenced_type" : "_ZTIP23AIBinder_DeathRecipient"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6104,10 +6104,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-685"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/stability.sdump"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h"
   },
   {
@@ -6116,10 +6116,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-685"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/stability.sdump"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h"
   },
   {
@@ -6128,13 +6128,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-595"
+     "referenced_type" : "_ZTIPK14AIBinder_Class"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "return_type" : "type-588",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6143,10 +6143,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6155,13 +6155,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-603"
+     "referenced_type" : "_ZTIPP7AParcel"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6170,13 +6170,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6185,13 +6185,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-613"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder_jni.sdump"
     }
    ],
-   "return_type" : "type-5",
+   "return_type" : "_ZTIP8_jobject",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
   },
   {
@@ -6200,22 +6200,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-603"
+     "referenced_type" : "_ZTIPP7AParcel"
     },
     {
-     "referenced_type" : "type-603"
+     "referenced_type" : "_ZTIPP7AParcel"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6224,16 +6224,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-601"
+     "referenced_type" : "_ZTIP23AIBinder_DeathRecipient"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6242,10 +6242,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6254,10 +6254,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6266,13 +6266,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-646"
+     "referenced_type" : "_ZTIPb"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6281,19 +6281,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-633"
+     "referenced_type" : "_ZTIPFbPviE"
     },
     {
-     "referenced_type" : "type-677"
+     "referenced_type" : "_ZTIPFvPvmbE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6302,13 +6302,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-431"
+     "referenced_type" : "_ZTIPa"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6317,16 +6317,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-684"
+     "referenced_type" : "_ZTIPFbPviPPaE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6335,13 +6335,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-647"
+     "referenced_type" : "_ZTIPDs"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6350,16 +6350,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-681"
+     "referenced_type" : "_ZTIPFbPviPPDsE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6368,13 +6368,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-449"
+     "referenced_type" : "_ZTIPd"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6383,16 +6383,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-675"
+     "referenced_type" : "_ZTIPFbPviPPdE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6401,13 +6401,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-446"
+     "referenced_type" : "_ZTIPf"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6416,16 +6416,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-672"
+     "referenced_type" : "_ZTIPFbPviPPfE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6434,13 +6434,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "_ZTIPi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6449,16 +6449,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-658"
+     "referenced_type" : "_ZTIPFbPviPPiE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6467,13 +6467,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-443"
+     "referenced_type" : "_ZTIPl"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6482,16 +6482,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-664"
+     "referenced_type" : "_ZTIPFbPviPPlE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6500,13 +6500,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "_ZTIPi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6515,19 +6515,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-633"
+     "referenced_type" : "_ZTIPFbPviE"
     },
     {
-     "referenced_type" : "type-642"
+     "referenced_type" : "_ZTIPFiPK7AParcelPvmE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6536,13 +6536,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-621"
+     "referenced_type" : "_ZTIPP7AStatus"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6551,16 +6551,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-624"
+     "referenced_type" : "_ZTIPFbPviPPcE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6569,19 +6569,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-633"
+     "referenced_type" : "_ZTIPFbPviE"
     },
     {
-     "referenced_type" : "type-635"
+     "referenced_type" : "_ZTIPFbPvmiPPcE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6590,13 +6590,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-678"
+     "referenced_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6605,13 +6605,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-644"
+     "referenced_type" : "_ZTIPj"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6620,16 +6620,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-661"
+     "referenced_type" : "_ZTIPFbPviPPjE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6638,13 +6638,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-645"
+     "referenced_type" : "_ZTIPm"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6653,16 +6653,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-669"
+     "referenced_type" : "_ZTIPFbPviPPmE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6671,13 +6671,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6686,13 +6686,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "_ZTIb"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6701,19 +6701,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-626"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-653"
+     "referenced_type" : "_ZTIPFbPKvmE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6722,13 +6722,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-26"
+     "referenced_type" : "_ZTIa"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6737,16 +6737,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "_ZTIPKa"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6755,13 +6755,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-643"
+     "referenced_type" : "_ZTIDs"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6770,16 +6770,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-655"
+     "referenced_type" : "_ZTIPKDs"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6788,13 +6788,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "_ZTId"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6803,16 +6803,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-508"
+     "referenced_type" : "_ZTIPKd"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6821,13 +6821,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-79"
+     "referenced_type" : "_ZTIf"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6836,16 +6836,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-504"
+     "referenced_type" : "_ZTIPKf"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6854,13 +6854,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6869,16 +6869,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-496"
+     "referenced_type" : "_ZTIPKi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6887,13 +6887,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "_ZTIl"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6902,16 +6902,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-500"
+     "referenced_type" : "_ZTIPKl"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6920,13 +6920,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6935,19 +6935,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-626"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-637"
+     "referenced_type" : "_ZTIPFiP7AParcelPKvmE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6956,13 +6956,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-618"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6971,16 +6971,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6989,19 +6989,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-626"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "_ZTIPFPKcPKvmPiE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7010,13 +7010,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-667"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7025,13 +7025,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7040,16 +7040,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-649"
+     "referenced_type" : "_ZTIPKj"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7058,13 +7058,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-628"
+     "referenced_type" : "_ZTIm"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7073,16 +7073,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-651"
+     "referenced_type" : "_ZTIPKm"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7091,13 +7091,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-692"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7106,10 +7106,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-692",
+   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7118,10 +7118,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-692",
+   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7130,10 +7130,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-687"
+     "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7142,10 +7142,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7154,10 +7154,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-687",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7166,13 +7166,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-687",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7181,10 +7181,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-687",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7193,13 +7193,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-687",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7208,10 +7208,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-687",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7220,10 +7220,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-691"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-21",
+   "return_type" : "_ZTIPKc",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7232,10 +7232,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-691"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7244,10 +7244,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-691"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-21",
+   "return_type" : "_ZTIPKc",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7256,10 +7256,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-691"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7268,10 +7268,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-691"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7280,16 +7280,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-691"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-596",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
    "function_name" : "AStatus_newOk",
    "linker_set_key" : "AStatus_newOk",
-   "return_type" : "type-687",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   }
  ],
@@ -7301,8 +7301,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP10_jintArray",
    "name" : "_jintArray *",
-   "referenced_type" : "type-414",
-   "self_type" : "type-413",
+   "referenced_type" : "_ZTI10_jintArray",
+   "self_type" : "_ZTIP10_jintArray",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7310,17 +7310,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP10_jmethodID",
    "name" : "_jmethodID *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-31",
-   "size" : 8,
-   "source_file" : "/libnativehelper/include_jni/jni.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP10_jmethodID",
-   "name" : "_jmethodID *",
-   "referenced_type" : "type-716",
-   "self_type" : "type-715",
+   "referenced_type" : "_ZTI10_jmethodID",
+   "self_type" : "_ZTIP10_jmethodID",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7328,8 +7319,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP11_jbyteArray",
    "name" : "_jbyteArray *",
-   "referenced_type" : "type-402",
-   "self_type" : "type-401",
+   "referenced_type" : "_ZTI11_jbyteArray",
+   "self_type" : "_ZTIP11_jbyteArray",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7337,8 +7328,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP11_jcharArray",
    "name" : "_jcharArray *",
-   "referenced_type" : "type-406",
-   "self_type" : "type-405",
+   "referenced_type" : "_ZTI11_jcharArray",
+   "self_type" : "_ZTIP11_jcharArray",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7346,8 +7337,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP11_jlongArray",
    "name" : "_jlongArray *",
-   "referenced_type" : "type-418",
-   "self_type" : "type-417",
+   "referenced_type" : "_ZTI11_jlongArray",
+   "self_type" : "_ZTIP11_jlongArray",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7355,8 +7346,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP11_jthrowable",
    "name" : "_jthrowable *",
-   "referenced_type" : "type-49",
-   "self_type" : "type-48",
+   "referenced_type" : "_ZTI11_jthrowable",
+   "self_type" : "_ZTIP11_jthrowable",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7364,8 +7355,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP12JavaVMOption",
    "name" : "JavaVMOption *",
-   "referenced_type" : "type-610",
-   "self_type" : "type-612",
+   "referenced_type" : "_ZTI12JavaVMOption",
+   "self_type" : "_ZTIP12JavaVMOption",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7373,8 +7364,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP12_jfloatArray",
    "name" : "_jfloatArray *",
-   "referenced_type" : "type-422",
-   "self_type" : "type-421",
+   "referenced_type" : "_ZTI12_jfloatArray",
+   "self_type" : "_ZTIP12_jfloatArray",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7382,8 +7373,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP12_jshortArray",
    "name" : "_jshortArray *",
-   "referenced_type" : "type-410",
-   "self_type" : "type-409",
+   "referenced_type" : "_ZTI12_jshortArray",
+   "self_type" : "_ZTIP12_jshortArray",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7391,17 +7382,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP13AIBinder_Weak",
    "name" : "AIBinder_Weak *",
-   "referenced_type" : "type-605",
-   "self_type" : "type-604",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP13AIBinder_Weak",
-   "name" : "AIBinder_Weak *",
-   "referenced_type" : "type-713",
-   "self_type" : "type-712",
+   "referenced_type" : "_ZTI13AIBinder_Weak",
+   "self_type" : "_ZTIP13AIBinder_Weak",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -7409,8 +7391,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP13_jdoubleArray",
    "name" : "_jdoubleArray *",
-   "referenced_type" : "type-426",
-   "self_type" : "type-425",
+   "referenced_type" : "_ZTI13_jdoubleArray",
+   "self_type" : "_ZTIP13_jdoubleArray",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7418,8 +7400,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP13_jobjectArray",
    "name" : "_jobjectArray *",
-   "referenced_type" : "type-390",
-   "self_type" : "type-389",
+   "referenced_type" : "_ZTI13_jobjectArray",
+   "self_type" : "_ZTIP13_jobjectArray",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7427,17 +7409,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP14AIBinder_Class",
    "name" : "AIBinder_Class *",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP14AIBinder_Class",
-   "name" : "AIBinder_Class *",
-   "referenced_type" : "type-695",
-   "self_type" : "type-694",
+   "referenced_type" : "_ZTI14AIBinder_Class",
+   "self_type" : "_ZTIP14AIBinder_Class",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -7445,8 +7418,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP14_jbooleanArray",
    "name" : "_jbooleanArray *",
-   "referenced_type" : "type-398",
-   "self_type" : "type-397",
+   "referenced_type" : "_ZTI14_jbooleanArray",
+   "self_type" : "_ZTIP14_jbooleanArray",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7454,35 +7427,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP23AIBinder_DeathRecipient",
    "name" : "AIBinder_DeathRecipient *",
-   "referenced_type" : "type-602",
-   "self_type" : "type-601",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP23AIBinder_DeathRecipient",
-   "name" : "AIBinder_DeathRecipient *",
-   "referenced_type" : "type-710",
-   "self_type" : "type-709",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP7AParcel",
-   "name" : "AParcel *",
-   "referenced_type" : "type-565",
-   "self_type" : "type-564",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP7AParcel",
-   "name" : "AParcel *",
-   "referenced_type" : "type-585",
-   "self_type" : "type-584",
+   "referenced_type" : "_ZTI23AIBinder_DeathRecipient",
+   "self_type" : "_ZTIP23AIBinder_DeathRecipient",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -7490,17 +7436,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP7AParcel",
    "name" : "AParcel *",
-   "referenced_type" : "type-631",
-   "self_type" : "type-630",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP7AParcel",
-   "name" : "AParcel *",
-   "referenced_type" : "type-702",
-   "self_type" : "type-701",
+   "referenced_type" : "_ZTI7AParcel",
+   "self_type" : "_ZTIP7AParcel",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -7508,44 +7445,17 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP7AStatus",
    "name" : "AStatus *",
-   "referenced_type" : "type-562",
-   "self_type" : "type-561",
+   "referenced_type" : "_ZTI7AStatus",
+   "self_type" : "_ZTIP7AStatus",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIP7AStatus",
-   "name" : "AStatus *",
-   "referenced_type" : "type-575",
-   "self_type" : "type-574",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP7AStatus",
-   "name" : "AStatus *",
-   "referenced_type" : "type-620",
-   "self_type" : "type-619",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP7AStatus",
-   "name" : "AStatus *",
-   "referenced_type" : "type-688",
-   "self_type" : "type-687",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIP7_JNIEnv",
    "name" : "_JNIEnv *",
-   "referenced_type" : "type-8",
-   "self_type" : "type-7",
+   "referenced_type" : "_ZTI7_JNIEnv",
+   "self_type" : "_ZTIP7_JNIEnv",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7553,8 +7463,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP7_JavaVM",
    "name" : "_JavaVM *",
-   "referenced_type" : "type-523",
-   "self_type" : "type-522",
+   "referenced_type" : "_ZTI7_JavaVM",
+   "self_type" : "_ZTIP7_JavaVM",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7562,8 +7472,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP7_jarray",
    "name" : "_jarray *",
-   "referenced_type" : "type-386",
-   "self_type" : "type-385",
+   "referenced_type" : "_ZTI7_jarray",
+   "self_type" : "_ZTIP7_jarray",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7571,8 +7481,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP7_jclass",
    "name" : "_jclass *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-19",
+   "referenced_type" : "_ZTI7_jclass",
+   "self_type" : "_ZTIP7_jclass",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7580,89 +7490,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP8AIBinder",
    "name" : "AIBinder *",
-   "referenced_type" : "type-557",
-   "self_type" : "type-556",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-570",
-   "self_type" : "type-569",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-573",
-   "self_type" : "type-572",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-580",
-   "self_type" : "type-579",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-589",
-   "self_type" : "type-588",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-613",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-668",
-   "self_type" : "type-667",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-686",
-   "self_type" : "type-685",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-693",
-   "self_type" : "type-692",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-697",
-   "self_type" : "type-696",
+   "referenced_type" : "_ZTI8AIBinder",
+   "self_type" : "_ZTIP8AIBinder",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -7670,8 +7499,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP8_jobject",
    "name" : "_jobject *",
-   "referenced_type" : "type-6",
-   "self_type" : "type-5",
+   "referenced_type" : "_ZTI8_jobject",
+   "self_type" : "_ZTIP8_jobject",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7679,17 +7508,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP8_jstring",
    "name" : "_jstring *",
-   "referenced_type" : "type-367",
-   "self_type" : "type-366",
-   "size" : 8,
-   "source_file" : "/libnativehelper/include_jni/jni.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP9_jfieldID",
-   "name" : "_jfieldID *",
-   "referenced_type" : "type-36",
-   "self_type" : "type-35",
+   "referenced_type" : "_ZTI8_jstring",
+   "self_type" : "_ZTIP8_jstring",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7697,8 +7517,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP9_jfieldID",
    "name" : "_jfieldID *",
-   "referenced_type" : "type-718",
-   "self_type" : "type-717",
+   "referenced_type" : "_ZTI9_jfieldID",
+   "self_type" : "_ZTIP9_jfieldID",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7706,8 +7526,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPDs",
    "name" : "char16_t *",
-   "referenced_type" : "type-643",
-   "self_type" : "type-647",
+   "referenced_type" : "_ZTIDs",
+   "self_type" : "_ZTIPDs",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -7715,8 +7535,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
    "name" : "jobjectRefType (*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
+   "referenced_type" : "_ZTIF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7724,8 +7544,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP10_jintArrayP7_JNIEnviE",
    "name" : "_jintArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-412",
-   "self_type" : "type-411",
+   "referenced_type" : "_ZTIFP10_jintArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP10_jintArrayP7_JNIEnviE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7733,8 +7553,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
    "name" : "_jmethodID *(*)(_JNIEnv *, _jclass *, const char *, const char *)",
-   "referenced_type" : "type-86",
-   "self_type" : "type-85",
+   "referenced_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
+   "self_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7742,8 +7562,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP10_jmethodIDP7_JNIEnvP8_jobjectE",
    "name" : "_jmethodID *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-30",
-   "self_type" : "type-29",
+   "referenced_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP8_jobjectE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7751,8 +7571,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP11_jbyteArrayP7_JNIEnviE",
    "name" : "_jbyteArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-400",
-   "self_type" : "type-399",
+   "referenced_type" : "_ZTIFP11_jbyteArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP11_jbyteArrayP7_JNIEnviE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7760,8 +7580,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP11_jcharArrayP7_JNIEnviE",
    "name" : "_jcharArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-404",
-   "self_type" : "type-403",
+   "referenced_type" : "_ZTIFP11_jcharArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP11_jcharArrayP7_JNIEnviE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7769,8 +7589,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP11_jlongArrayP7_JNIEnviE",
    "name" : "_jlongArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-416",
-   "self_type" : "type-415",
+   "referenced_type" : "_ZTIFP11_jlongArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP11_jlongArrayP7_JNIEnviE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7778,8 +7598,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP11_jthrowableP7_JNIEnvE",
    "name" : "_jthrowable *(*)(_JNIEnv *)",
-   "referenced_type" : "type-53",
-   "self_type" : "type-52",
+   "referenced_type" : "_ZTIFP11_jthrowableP7_JNIEnvE",
+   "self_type" : "_ZTIPFP11_jthrowableP7_JNIEnvE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7787,8 +7607,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP12_jfloatArrayP7_JNIEnviE",
    "name" : "_jfloatArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-420",
-   "self_type" : "type-419",
+   "referenced_type" : "_ZTIFP12_jfloatArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP12_jfloatArrayP7_JNIEnviE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7796,8 +7616,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP12_jshortArrayP7_JNIEnviE",
    "name" : "_jshortArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-408",
-   "self_type" : "type-407",
+   "referenced_type" : "_ZTIFP12_jshortArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP12_jshortArrayP7_JNIEnviE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7805,8 +7625,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP13_jdoubleArrayP7_JNIEnviE",
    "name" : "_jdoubleArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-424",
-   "self_type" : "type-423",
+   "referenced_type" : "_ZTIFP13_jdoubleArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP13_jdoubleArrayP7_JNIEnviE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7814,8 +7634,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
    "name" : "_jobjectArray *(*)(_JNIEnv *, int, _jclass *, _jobject *)",
-   "referenced_type" : "type-388",
-   "self_type" : "type-387",
+   "referenced_type" : "_ZTIFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
+   "self_type" : "_ZTIPFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7823,8 +7643,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP14_jbooleanArrayP7_JNIEnviE",
    "name" : "_jbooleanArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-396",
-   "self_type" : "type-395",
+   "referenced_type" : "_ZTIFP14_jbooleanArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP14_jbooleanArrayP7_JNIEnviE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7832,8 +7652,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP7_jclassP7_JNIEnvP8_jobjectE",
    "name" : "_jclass *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-82",
-   "self_type" : "type-81",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFP7_jclassP7_JNIEnvP8_jobjectE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7841,8 +7661,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP7_jclassP7_JNIEnvPKcE",
    "name" : "_jclass *(*)(_JNIEnv *, const char *)",
-   "referenced_type" : "type-28",
-   "self_type" : "type-27",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvPKcE",
+   "self_type" : "_ZTIPFP7_jclassP7_JNIEnvPKcE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7850,8 +7670,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
    "name" : "_jclass *(*)(_JNIEnv *, const char *, _jobject *, const signed char *, int)",
-   "referenced_type" : "type-18",
-   "self_type" : "type-17",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
+   "self_type" : "_ZTIPFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7859,8 +7679,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP7_jclassP7_JNIEnvS0_E",
    "name" : "_jclass *(*)(_JNIEnv *, _jclass *)",
-   "referenced_type" : "type-41",
-   "self_type" : "type-40",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvS0_E",
+   "self_type" : "_ZTIPFP7_jclassP7_JNIEnvS0_E",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7868,8 +7688,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobjectArray *, int)",
-   "referenced_type" : "type-392",
-   "self_type" : "type-391",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7877,8 +7697,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *)",
-   "referenced_type" : "type-4",
-   "self_type" : "type-3",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7886,8 +7706,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-72",
-   "self_type" : "type-71",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7895,8 +7715,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-69",
-   "self_type" : "type-68",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7904,8 +7724,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jmethodID *, unsigned char)",
-   "referenced_type" : "type-38",
-   "self_type" : "type-37",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7913,8 +7733,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-67",
-   "self_type" : "type-66",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7922,8 +7742,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-329",
-   "self_type" : "type-328",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7931,8 +7751,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jfieldID *, unsigned char)",
-   "referenced_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7940,8 +7760,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvPvlE",
    "name" : "_jobject *(*)(_JNIEnv *, void *, long)",
-   "referenced_type" : "type-547",
-   "self_type" : "type-546",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvPvlE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvPvlE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7949,8 +7769,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-61",
-   "self_type" : "type-60",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_E",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7958,8 +7778,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-93",
-   "self_type" : "type-92",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7967,8 +7787,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDSt9__va_listE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-90",
-   "self_type" : "type-89",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7976,8 +7796,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-88",
-   "self_type" : "type-87",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7985,8 +7805,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-163",
-   "self_type" : "type-162",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7994,8 +7814,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-160",
-   "self_type" : "type-159",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8003,8 +7823,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-158",
-   "self_type" : "type-157",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8012,8 +7832,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-230",
-   "self_type" : "type-229",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8021,8 +7841,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jstringP7_JNIEnvPKcE",
    "name" : "_jstring *(*)(_JNIEnv *, const char *)",
-   "referenced_type" : "type-378",
-   "self_type" : "type-377",
+   "referenced_type" : "_ZTIFP8_jstringP7_JNIEnvPKcE",
+   "self_type" : "_ZTIPFP8_jstringP7_JNIEnvPKcE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8030,8 +7850,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jstringP7_JNIEnvPKtiE",
    "name" : "_jstring *(*)(_JNIEnv *, const unsigned short *, int)",
-   "referenced_type" : "type-365",
-   "self_type" : "type-364",
+   "referenced_type" : "_ZTIFP8_jstringP7_JNIEnvPKtiE",
+   "self_type" : "_ZTIPFP8_jstringP7_JNIEnvPKtiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8039,8 +7859,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
    "name" : "_jfieldID *(*)(_JNIEnv *, _jclass *, const char *, const char *)",
-   "referenced_type" : "type-228",
-   "self_type" : "type-227",
+   "referenced_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
+   "self_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8048,8 +7868,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP9_jfieldIDP7_JNIEnvP8_jobjectE",
    "name" : "_jfieldID *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-34",
-   "self_type" : "type-33",
+   "referenced_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP8_jobjectE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8057,8 +7877,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFPKcP7_JNIEnvP8_jstringPhE",
    "name" : "const char *(*)(_JNIEnv *, _jstring *, unsigned char *)",
-   "referenced_type" : "type-380",
-   "self_type" : "type-379",
+   "referenced_type" : "_ZTIFPKcP7_JNIEnvP8_jstringPhE",
+   "self_type" : "_ZTIPFPKcP7_JNIEnvP8_jstringPhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8066,8 +7886,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFPKcPKvmPiE",
    "name" : "const char *(*)(const void *, unsigned long, int *)",
-   "referenced_type" : "type-627",
-   "self_type" : "type-629",
+   "referenced_type" : "_ZTIFPKcPKvmPiE",
+   "self_type" : "_ZTIPFPKcPKvmPiE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8075,8 +7895,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFPKtP7_JNIEnvP8_jstringPhE",
    "name" : "const unsigned short *(*)(_JNIEnv *, _jstring *, unsigned char *)",
-   "referenced_type" : "type-373",
-   "self_type" : "type-372",
+   "referenced_type" : "_ZTIFPKtP7_JNIEnvP8_jstringPhE",
+   "self_type" : "_ZTIPFPKtP7_JNIEnvP8_jstringPhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8084,8 +7904,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFPaP7_JNIEnvP11_jbyteArrayPhE",
    "name" : "signed char *(*)(_JNIEnv *, _jbyteArray *, unsigned char *)",
-   "referenced_type" : "type-430",
-   "self_type" : "type-429",
+   "referenced_type" : "_ZTIFPaP7_JNIEnvP11_jbyteArrayPhE",
+   "self_type" : "_ZTIPFPaP7_JNIEnvP11_jbyteArrayPhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8093,8 +7913,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFPdP7_JNIEnvP13_jdoubleArrayPhE",
    "name" : "double *(*)(_JNIEnv *, _jdoubleArray *, unsigned char *)",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
+   "referenced_type" : "_ZTIFPdP7_JNIEnvP13_jdoubleArrayPhE",
+   "self_type" : "_ZTIPFPdP7_JNIEnvP13_jdoubleArrayPhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8102,8 +7922,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFPfP7_JNIEnvP12_jfloatArrayPhE",
    "name" : "float *(*)(_JNIEnv *, _jfloatArray *, unsigned char *)",
-   "referenced_type" : "type-445",
-   "self_type" : "type-444",
+   "referenced_type" : "_ZTIFPfP7_JNIEnvP12_jfloatArrayPhE",
+   "self_type" : "_ZTIPFPfP7_JNIEnvP12_jfloatArrayPhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8111,8 +7931,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFPhP7_JNIEnvP14_jbooleanArrayS_E",
    "name" : "unsigned char *(*)(_JNIEnv *, _jbooleanArray *, unsigned char *)",
-   "referenced_type" : "type-428",
-   "self_type" : "type-427",
+   "referenced_type" : "_ZTIFPhP7_JNIEnvP14_jbooleanArrayS_E",
+   "self_type" : "_ZTIPFPhP7_JNIEnvP14_jbooleanArrayS_E",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8120,8 +7940,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFPiP7_JNIEnvP10_jintArrayPhE",
    "name" : "int *(*)(_JNIEnv *, _jintArray *, unsigned char *)",
-   "referenced_type" : "type-439",
-   "self_type" : "type-438",
+   "referenced_type" : "_ZTIFPiP7_JNIEnvP10_jintArrayPhE",
+   "self_type" : "_ZTIPFPiP7_JNIEnvP10_jintArrayPhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8129,8 +7949,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFPlP7_JNIEnvP11_jlongArrayPhE",
    "name" : "long *(*)(_JNIEnv *, _jlongArray *, unsigned char *)",
-   "referenced_type" : "type-442",
-   "self_type" : "type-441",
+   "referenced_type" : "_ZTIFPlP7_JNIEnvP11_jlongArrayPhE",
+   "self_type" : "_ZTIPFPlP7_JNIEnvP11_jlongArrayPhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8138,8 +7958,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFPsP7_JNIEnvP12_jshortArrayPhE",
    "name" : "short *(*)(_JNIEnv *, _jshortArray *, unsigned char *)",
-   "referenced_type" : "type-436",
-   "self_type" : "type-435",
+   "referenced_type" : "_ZTIFPsP7_JNIEnvP12_jshortArrayPhE",
+   "self_type" : "_ZTIPFPsP7_JNIEnvP12_jshortArrayPhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8147,8 +7967,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFPtP7_JNIEnvP11_jcharArrayPhE",
    "name" : "unsigned short *(*)(_JNIEnv *, _jcharArray *, unsigned char *)",
-   "referenced_type" : "type-433",
-   "self_type" : "type-432",
+   "referenced_type" : "_ZTIFPtP7_JNIEnvP11_jcharArrayPhE",
+   "self_type" : "_ZTIPFPtP7_JNIEnvP11_jcharArrayPhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8156,8 +7976,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFPvP7_JNIEnvP7_jarrayPhE",
    "name" : "void *(*)(_JNIEnv *, _jarray *, unsigned char *)",
-   "referenced_type" : "type-541",
-   "self_type" : "type-540",
+   "referenced_type" : "_ZTIFPvP7_JNIEnvP7_jarrayPhE",
+   "self_type" : "_ZTIPFPvP7_JNIEnvP7_jarrayPhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8165,8 +7985,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFPvP7_JNIEnvP8_jobjectE",
    "name" : "void *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-549",
-   "self_type" : "type-548",
+   "referenced_type" : "_ZTIFPvP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFPvP7_JNIEnvP8_jobjectE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8174,8 +7994,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFPvS_E",
    "name" : "void *(*)(void *)",
-   "referenced_type" : "type-607",
-   "self_type" : "type-608",
+   "referenced_type" : "_ZTIFPvS_E",
+   "self_type" : "_ZTIPFPvS_E",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -8183,8 +8003,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "signed char (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-278",
-   "self_type" : "type-277",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8192,8 +8012,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "signed char (*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-275",
-   "self_type" : "type-274",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8201,8 +8021,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "signed char (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-273",
-   "self_type" : "type-272",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8210,8 +8030,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "signed char (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-333",
-   "self_type" : "type-332",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8219,8 +8039,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-107",
-   "self_type" : "type-106",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8228,8 +8048,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-104",
-   "self_type" : "type-103",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8237,8 +8057,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-102",
-   "self_type" : "type-101",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8246,8 +8066,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-177",
-   "self_type" : "type-176",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8255,8 +8075,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-174",
-   "self_type" : "type-173",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8264,8 +8084,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-172",
-   "self_type" : "type-171",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8273,8 +8093,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-234",
-   "self_type" : "type-233",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8282,8 +8102,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFbPKvmE",
    "name" : "bool (*)(const void *, unsigned long)",
-   "referenced_type" : "type-652",
-   "self_type" : "type-653",
+   "referenced_type" : "_ZTIFbPKvmE",
+   "self_type" : "_ZTIPFbPKvmE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8291,8 +8111,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFbPviE",
    "name" : "bool (*)(void *, int)",
-   "referenced_type" : "type-632",
-   "self_type" : "type-633",
+   "referenced_type" : "_ZTIFbPviE",
+   "self_type" : "_ZTIPFbPviE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8300,8 +8120,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFbPviPPDsE",
    "name" : "bool (*)(void *, int, char16_t **)",
-   "referenced_type" : "type-679",
-   "self_type" : "type-681",
+   "referenced_type" : "_ZTIFbPviPPDsE",
+   "self_type" : "_ZTIPFbPviPPDsE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8309,8 +8129,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFbPviPPaE",
    "name" : "bool (*)(void *, int, signed char **)",
-   "referenced_type" : "type-682",
-   "self_type" : "type-684",
+   "referenced_type" : "_ZTIFbPviPPaE",
+   "self_type" : "_ZTIPFbPviPPaE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8318,8 +8138,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFbPviPPcE",
    "name" : "bool (*)(void *, int, char **)",
-   "referenced_type" : "type-622",
-   "self_type" : "type-624",
+   "referenced_type" : "_ZTIFbPviPPcE",
+   "self_type" : "_ZTIPFbPviPPcE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8327,8 +8147,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFbPviPPdE",
    "name" : "bool (*)(void *, int, double **)",
-   "referenced_type" : "type-673",
-   "self_type" : "type-675",
+   "referenced_type" : "_ZTIFbPviPPdE",
+   "self_type" : "_ZTIPFbPviPPdE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8336,8 +8156,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFbPviPPfE",
    "name" : "bool (*)(void *, int, float **)",
-   "referenced_type" : "type-670",
-   "self_type" : "type-672",
+   "referenced_type" : "_ZTIFbPviPPfE",
+   "self_type" : "_ZTIPFbPviPPfE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8345,8 +8165,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFbPviPPiE",
    "name" : "bool (*)(void *, int, int **)",
-   "referenced_type" : "type-656",
-   "self_type" : "type-658",
+   "referenced_type" : "_ZTIFbPviPPiE",
+   "self_type" : "_ZTIPFbPviPPiE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8354,8 +8174,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFbPviPPjE",
    "name" : "bool (*)(void *, int, unsigned int **)",
-   "referenced_type" : "type-659",
-   "self_type" : "type-661",
+   "referenced_type" : "_ZTIFbPviPPjE",
+   "self_type" : "_ZTIPFbPviPPjE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8363,8 +8183,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFbPviPPlE",
    "name" : "bool (*)(void *, int, long **)",
-   "referenced_type" : "type-662",
-   "self_type" : "type-664",
+   "referenced_type" : "_ZTIFbPviPPlE",
+   "self_type" : "_ZTIPFbPviPPlE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8372,8 +8192,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFbPviPPmE",
    "name" : "bool (*)(void *, int, unsigned long **)",
-   "referenced_type" : "type-665",
-   "self_type" : "type-669",
+   "referenced_type" : "_ZTIFbPviPPmE",
+   "self_type" : "_ZTIPFbPviPPmE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8381,8 +8201,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFbPvmiPPcE",
    "name" : "bool (*)(void *, unsigned long, int, char **)",
-   "referenced_type" : "type-634",
-   "self_type" : "type-635",
+   "referenced_type" : "_ZTIFbPvmiPPcE",
+   "self_type" : "_ZTIPFbPvmiPPcE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8390,8 +8210,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-320",
-   "self_type" : "type-319",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8399,8 +8219,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-317",
-   "self_type" : "type-316",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8408,8 +8228,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-315",
-   "self_type" : "type-314",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8417,8 +8237,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-345",
-   "self_type" : "type-344",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8426,8 +8246,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-149",
-   "self_type" : "type-148",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8435,8 +8255,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-146",
-   "self_type" : "type-145",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8444,8 +8264,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-144",
-   "self_type" : "type-143",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8453,8 +8273,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-219",
-   "self_type" : "type-218",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8462,8 +8282,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-216",
-   "self_type" : "type-215",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8471,8 +8291,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-214",
-   "self_type" : "type-213",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8480,8 +8300,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-246",
-   "self_type" : "type-245",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8489,8 +8309,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "float (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-313",
-   "self_type" : "type-312",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8498,8 +8318,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "float (*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-310",
-   "self_type" : "type-309",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8507,8 +8327,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "float (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8516,8 +8336,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "float (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-343",
-   "self_type" : "type-342",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8525,8 +8345,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-142",
-   "self_type" : "type-141",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8534,8 +8354,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8543,8 +8363,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-137",
-   "self_type" : "type-136",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8552,8 +8372,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-212",
-   "self_type" : "type-211",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8561,8 +8381,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-209",
-   "self_type" : "type-208",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8570,8 +8390,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-207",
-   "self_type" : "type-206",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8579,8 +8399,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-244",
-   "self_type" : "type-243",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8588,8 +8408,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvE",
    "name" : "unsigned char (*)(_JNIEnv *)",
-   "referenced_type" : "type-545",
-   "self_type" : "type-544",
+   "referenced_type" : "_ZTIFhP7_JNIEnvE",
+   "self_type" : "_ZTIPFhP7_JNIEnvE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8597,8 +8417,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-271",
-   "self_type" : "type-270",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8606,8 +8426,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-268",
-   "self_type" : "type-267",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8615,8 +8435,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-266",
-   "self_type" : "type-265",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8624,8 +8444,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-331",
-   "self_type" : "type-330",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8633,8 +8453,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassS2_E",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jclass *)",
-   "referenced_type" : "type-43",
-   "self_type" : "type-42",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassS2_E",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassS2_E",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8642,8 +8462,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-100",
-   "self_type" : "type-99",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8651,8 +8471,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8660,8 +8480,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-95",
-   "self_type" : "type-94",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8669,8 +8489,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jclass *)",
-   "referenced_type" : "type-84",
-   "self_type" : "type-83",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8678,8 +8498,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-170",
-   "self_type" : "type-169",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8687,8 +8507,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-167",
-   "self_type" : "type-166",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8696,8 +8516,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-165",
-   "self_type" : "type-164",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8705,8 +8525,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-232",
-   "self_type" : "type-231",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8714,8 +8534,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectS2_E",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jobject *)",
-   "referenced_type" : "type-65",
-   "self_type" : "type-64",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectS2_E",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectS2_E",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8723,8 +8543,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7AParcelPKvmE",
    "name" : "int (*)(AParcel *, const void *, unsigned long)",
-   "referenced_type" : "type-636",
-   "self_type" : "type-637",
+   "referenced_type" : "_ZTIFiP7AParcelPKvmE",
+   "self_type" : "_ZTIPFiP7AParcelPKvmE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8732,8 +8552,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvE",
    "name" : "int (*)(_JNIEnv *)",
-   "referenced_type" : "type-15",
-   "self_type" : "type-14",
+   "referenced_type" : "_ZTIFiP7_JNIEnvE",
+   "self_type" : "_ZTIPFiP7_JNIEnvE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8741,8 +8561,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP11_jthrowableE",
    "name" : "int (*)(_JNIEnv *, _jthrowable *)",
-   "referenced_type" : "type-47",
-   "self_type" : "type-46",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP11_jthrowableE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP11_jthrowableE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8750,8 +8570,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jarrayE",
    "name" : "int (*)(_JNIEnv *, _jarray *)",
-   "referenced_type" : "type-384",
-   "self_type" : "type-383",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jarrayE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jarrayE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8759,8 +8579,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassE",
    "name" : "int (*)(_JNIEnv *, _jclass *)",
-   "referenced_type" : "type-516",
-   "self_type" : "type-515",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8768,8 +8588,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "int (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-299",
-   "self_type" : "type-298",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8777,8 +8597,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "int (*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-296",
-   "self_type" : "type-295",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8786,8 +8606,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "int (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-294",
-   "self_type" : "type-293",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8795,8 +8615,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "int (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-339",
-   "self_type" : "type-338",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8804,8 +8624,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
    "name" : "int (*)(_JNIEnv *, _jclass *, const JNINativeMethod *, int)",
-   "referenced_type" : "type-511",
-   "self_type" : "type-510",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8813,8 +8633,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassPKcE",
    "name" : "int (*)(_JNIEnv *, _jclass *, const char *)",
-   "referenced_type" : "type-51",
-   "self_type" : "type-50",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassPKcE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassPKcE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8822,8 +8642,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectE",
    "name" : "int (*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-518",
-   "self_type" : "type-517",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8831,8 +8651,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-128",
-   "self_type" : "type-127",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8840,8 +8660,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-125",
-   "self_type" : "type-124",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8849,8 +8669,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-123",
-   "self_type" : "type-122",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8858,8 +8678,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-198",
-   "self_type" : "type-197",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8867,8 +8687,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-195",
-   "self_type" : "type-194",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8876,8 +8696,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-193",
-   "self_type" : "type-192",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8885,8 +8705,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-240",
-   "self_type" : "type-239",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8894,8 +8714,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jstringE",
    "name" : "int (*)(_JNIEnv *, _jstring *)",
-   "referenced_type" : "type-371",
-   "self_type" : "type-370",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jstringE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jstringE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8903,8 +8723,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvPP7_JavaVME",
    "name" : "int (*)(_JNIEnv *, _JavaVM **)",
-   "referenced_type" : "type-520",
-   "self_type" : "type-519",
+   "referenced_type" : "_ZTIFiP7_JNIEnvPP7_JavaVME",
+   "self_type" : "_ZTIPFiP7_JNIEnvPP7_JavaVME",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8912,8 +8732,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnviE",
    "name" : "int (*)(_JNIEnv *, int)",
-   "referenced_type" : "type-59",
-   "self_type" : "type-58",
+   "referenced_type" : "_ZTIFiP7_JNIEnviE",
+   "self_type" : "_ZTIPFiP7_JNIEnviE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8921,8 +8741,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JavaVME",
    "name" : "int (*)(_JavaVM *)",
-   "referenced_type" : "type-528",
-   "self_type" : "type-527",
+   "referenced_type" : "_ZTIFiP7_JavaVME",
+   "self_type" : "_ZTIPFiP7_JavaVME",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8930,8 +8750,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JavaVMPP7_JNIEnvPvE",
    "name" : "int (*)(_JavaVM *, _JNIEnv **, void *)",
-   "referenced_type" : "type-530",
-   "self_type" : "type-529",
+   "referenced_type" : "_ZTIFiP7_JavaVMPP7_JNIEnvPvE",
+   "self_type" : "_ZTIPFiP7_JavaVMPP7_JNIEnvPvE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8939,8 +8759,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JavaVMPPviE",
    "name" : "int (*)(_JavaVM *, void **, int)",
-   "referenced_type" : "type-533",
-   "self_type" : "type-532",
+   "referenced_type" : "_ZTIFiP7_JavaVMPPviE",
+   "self_type" : "_ZTIPFiP7_JavaVMPPviE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8948,8 +8768,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP8AIBinderiPPKcjE",
    "name" : "int (*)(AIBinder *, int, const char **, unsigned int)",
-   "referenced_type" : "type-590",
-   "self_type" : "type-592",
+   "referenced_type" : "_ZTIFiP8AIBinderiPPKcjE",
+   "self_type" : "_ZTIPFiP8AIBinderiPPKcjE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -8957,8 +8777,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP8AIBinderjPK7AParcelPS1_E",
    "name" : "int (*)(AIBinder *, unsigned int, const AParcel *, AParcel *)",
-   "referenced_type" : "type-587",
-   "self_type" : "type-586",
+   "referenced_type" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
+   "self_type" : "_ZTIPFiP8AIBinderjPK7AParcelPS1_E",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -8966,8 +8786,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiPK7AParcelPvmE",
    "name" : "int (*)(const AParcel *, void *, unsigned long)",
-   "referenced_type" : "type-638",
-   "self_type" : "type-642",
+   "referenced_type" : "_ZTIFiPK7AParcelPvmE",
+   "self_type" : "_ZTIPFiPK7AParcelPvmE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8975,8 +8795,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFlP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "long (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-306",
-   "self_type" : "type-305",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFlP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8984,8 +8804,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFlP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "long (*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-303",
-   "self_type" : "type-302",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFlP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8993,8 +8813,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFlP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "long (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-301",
-   "self_type" : "type-300",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFlP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9002,8 +8822,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFlP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "long (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-341",
-   "self_type" : "type-340",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFlP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9011,8 +8831,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFlP7_JNIEnvP8_jobjectE",
    "name" : "long (*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-551",
-   "self_type" : "type-550",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFlP7_JNIEnvP8_jobjectE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9020,8 +8840,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFlP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "long (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-135",
-   "self_type" : "type-134",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFlP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9029,8 +8849,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFlP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "name" : "long (*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-132",
-   "self_type" : "type-131",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFlP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9038,8 +8858,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFlP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "long (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-130",
-   "self_type" : "type-129",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFlP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9047,8 +8867,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "long (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-205",
-   "self_type" : "type-204",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9056,8 +8876,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "long (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-202",
-   "self_type" : "type-201",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9065,8 +8885,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "long (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-200",
-   "self_type" : "type-199",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9074,8 +8894,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFlP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "long (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-242",
-   "self_type" : "type-241",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFlP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9083,8 +8903,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "short (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-292",
-   "self_type" : "type-291",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9092,8 +8912,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "short (*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-289",
-   "self_type" : "type-288",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9101,8 +8921,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "short (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-287",
-   "self_type" : "type-286",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9110,8 +8930,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "short (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-337",
-   "self_type" : "type-336",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9119,8 +8939,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-121",
-   "self_type" : "type-120",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9128,8 +8948,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-118",
-   "self_type" : "type-117",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9137,8 +8957,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-116",
-   "self_type" : "type-115",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9146,8 +8966,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-191",
-   "self_type" : "type-190",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9155,8 +8975,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-188",
-   "self_type" : "type-187",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9164,8 +8984,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-186",
-   "self_type" : "type-185",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9173,8 +8993,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-238",
-   "self_type" : "type-237",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9182,8 +9002,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "unsigned short (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-285",
-   "self_type" : "type-284",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9191,8 +9011,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "unsigned short (*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-282",
-   "self_type" : "type-281",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9200,8 +9020,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "unsigned short (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-280",
-   "self_type" : "type-279",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9209,8 +9029,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "unsigned short (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-335",
-   "self_type" : "type-334",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9218,8 +9038,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-114",
-   "self_type" : "type-113",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9227,8 +9047,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-111",
-   "self_type" : "type-110",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9236,8 +9056,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-109",
-   "self_type" : "type-108",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9245,8 +9065,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-184",
-   "self_type" : "type-183",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9254,8 +9074,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9263,8 +9083,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-179",
-   "self_type" : "type-178",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9272,8 +9092,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-236",
-   "self_type" : "type-235",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9281,8 +9101,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvE",
    "name" : "void (*)(_JNIEnv *)",
-   "referenced_type" : "type-55",
-   "self_type" : "type-54",
+   "referenced_type" : "_ZTIFvP7_JNIEnvE",
+   "self_type" : "_ZTIPFvP7_JNIEnvE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9290,8 +9110,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP10_jintArrayPiiE",
    "name" : "void (*)(_JNIEnv *, _jintArray *, int *, int)",
-   "referenced_type" : "type-459",
-   "self_type" : "type-458",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayPiiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayPiiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9299,8 +9119,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPKiE",
    "name" : "void (*)(_JNIEnv *, _jintArray *, int, int, const int *)",
-   "referenced_type" : "type-495",
-   "self_type" : "type-494",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPKiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPKiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9308,8 +9128,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPiE",
    "name" : "void (*)(_JNIEnv *, _jintArray *, int, int, int *)",
-   "referenced_type" : "type-475",
-   "self_type" : "type-474",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9317,8 +9137,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayPaiE",
    "name" : "void (*)(_JNIEnv *, _jbyteArray *, signed char *, int)",
-   "referenced_type" : "type-453",
-   "self_type" : "type-452",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayPaiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayPaiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9326,8 +9146,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPKaE",
    "name" : "void (*)(_JNIEnv *, _jbyteArray *, int, int, const signed char *)",
-   "referenced_type" : "type-487",
-   "self_type" : "type-486",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPKaE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPKaE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9335,8 +9155,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPaE",
    "name" : "void (*)(_JNIEnv *, _jbyteArray *, int, int, signed char *)",
-   "referenced_type" : "type-469",
-   "self_type" : "type-468",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPaE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPaE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9344,8 +9164,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jcharArrayPtiE",
    "name" : "void (*)(_JNIEnv *, _jcharArray *, unsigned short *, int)",
-   "referenced_type" : "type-455",
-   "self_type" : "type-454",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayPtiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayPtiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9353,8 +9173,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPKtE",
    "name" : "void (*)(_JNIEnv *, _jcharArray *, int, int, const unsigned short *)",
-   "referenced_type" : "type-489",
-   "self_type" : "type-488",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPKtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPKtE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9362,8 +9182,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPtE",
    "name" : "void (*)(_JNIEnv *, _jcharArray *, int, int, unsigned short *)",
-   "referenced_type" : "type-471",
-   "self_type" : "type-470",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPtE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9371,8 +9191,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jlongArrayPliE",
    "name" : "void (*)(_JNIEnv *, _jlongArray *, long *, int)",
-   "referenced_type" : "type-461",
-   "self_type" : "type-460",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayPliE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayPliE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9380,8 +9200,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPKlE",
    "name" : "void (*)(_JNIEnv *, _jlongArray *, int, int, const long *)",
-   "referenced_type" : "type-499",
-   "self_type" : "type-498",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPKlE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPKlE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9389,8 +9209,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPlE",
    "name" : "void (*)(_JNIEnv *, _jlongArray *, int, int, long *)",
-   "referenced_type" : "type-477",
-   "self_type" : "type-476",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPlE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPlE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9398,8 +9218,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayPfiE",
    "name" : "void (*)(_JNIEnv *, _jfloatArray *, float *, int)",
-   "referenced_type" : "type-463",
-   "self_type" : "type-462",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayPfiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayPfiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9407,8 +9227,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPKfE",
    "name" : "void (*)(_JNIEnv *, _jfloatArray *, int, int, const float *)",
-   "referenced_type" : "type-503",
-   "self_type" : "type-502",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPKfE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPKfE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9416,8 +9236,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPfE",
    "name" : "void (*)(_JNIEnv *, _jfloatArray *, int, int, float *)",
-   "referenced_type" : "type-479",
-   "self_type" : "type-478",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPfE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPfE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9425,8 +9245,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jshortArrayPsiE",
    "name" : "void (*)(_JNIEnv *, _jshortArray *, short *, int)",
-   "referenced_type" : "type-457",
-   "self_type" : "type-456",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayPsiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayPsiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9434,8 +9254,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPKsE",
    "name" : "void (*)(_JNIEnv *, _jshortArray *, int, int, const short *)",
-   "referenced_type" : "type-491",
-   "self_type" : "type-490",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPKsE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPKsE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9443,8 +9263,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPsE",
    "name" : "void (*)(_JNIEnv *, _jshortArray *, int, int, short *)",
-   "referenced_type" : "type-473",
-   "self_type" : "type-472",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPsE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPsE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9452,8 +9272,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayPdiE",
    "name" : "void (*)(_JNIEnv *, _jdoubleArray *, double *, int)",
-   "referenced_type" : "type-465",
-   "self_type" : "type-464",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayPdiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayPdiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9461,8 +9281,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
    "name" : "void (*)(_JNIEnv *, _jdoubleArray *, int, int, const double *)",
-   "referenced_type" : "type-507",
-   "self_type" : "type-506",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9470,8 +9290,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPdE",
    "name" : "void (*)(_JNIEnv *, _jdoubleArray *, int, int, double *)",
-   "referenced_type" : "type-481",
-   "self_type" : "type-480",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPdE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPdE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9479,8 +9299,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
    "name" : "void (*)(_JNIEnv *, _jobjectArray *, int, _jobject *)",
-   "referenced_type" : "type-394",
-   "self_type" : "type-393",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9488,8 +9308,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayPhiE",
    "name" : "void (*)(_JNIEnv *, _jbooleanArray *, unsigned char *, int)",
-   "referenced_type" : "type-451",
-   "self_type" : "type-450",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayPhiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayPhiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9497,8 +9317,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
    "name" : "void (*)(_JNIEnv *, _jbooleanArray *, int, int, const unsigned char *)",
-   "referenced_type" : "type-483",
-   "self_type" : "type-482",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9506,8 +9326,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPhE",
    "name" : "void (*)(_JNIEnv *, _jbooleanArray *, int, int, unsigned char *)",
-   "referenced_type" : "type-467",
-   "self_type" : "type-466",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPhE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9515,8 +9335,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jarrayPviE",
    "name" : "void (*)(_JNIEnv *, _jarray *, void *, int)",
-   "referenced_type" : "type-543",
-   "self_type" : "type-542",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jarrayPviE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jarrayPviE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9524,8 +9344,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-327",
-   "self_type" : "type-326",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9533,8 +9353,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-324",
-   "self_type" : "type-323",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9542,8 +9362,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-322",
-   "self_type" : "type-321",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9551,8 +9371,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, _jobject *)",
-   "referenced_type" : "type-347",
-   "self_type" : "type-346",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9560,8 +9380,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, signed char)",
-   "referenced_type" : "type-351",
-   "self_type" : "type-350",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9569,8 +9389,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, double)",
-   "referenced_type" : "type-363",
-   "self_type" : "type-362",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9578,8 +9398,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, float)",
-   "referenced_type" : "type-361",
-   "self_type" : "type-360",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9587,8 +9407,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, unsigned char)",
-   "referenced_type" : "type-349",
-   "self_type" : "type-348",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9596,8 +9416,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, int)",
-   "referenced_type" : "type-357",
-   "self_type" : "type-356",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9605,8 +9425,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDlE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, long)",
-   "referenced_type" : "type-359",
-   "self_type" : "type-358",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDlE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDlE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9614,8 +9434,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, short)",
-   "referenced_type" : "type-355",
-   "self_type" : "type-354",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9623,8 +9443,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, unsigned short)",
-   "referenced_type" : "type-353",
-   "self_type" : "type-352",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9632,8 +9452,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectE",
    "name" : "void (*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9641,8 +9461,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-156",
-   "self_type" : "type-155",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9650,8 +9470,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-153",
-   "self_type" : "type-152",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9659,8 +9479,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-151",
-   "self_type" : "type-150",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9668,8 +9488,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-226",
-   "self_type" : "type-225",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9677,8 +9497,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-223",
-   "self_type" : "type-222",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9686,8 +9506,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-221",
-   "self_type" : "type-220",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9695,8 +9515,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, _jobject *)",
-   "referenced_type" : "type-248",
-   "self_type" : "type-247",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9704,8 +9524,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, signed char)",
-   "referenced_type" : "type-252",
-   "self_type" : "type-251",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9713,8 +9533,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, double)",
-   "referenced_type" : "type-264",
-   "self_type" : "type-263",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9722,8 +9542,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, float)",
-   "referenced_type" : "type-262",
-   "self_type" : "type-261",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9731,8 +9551,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, unsigned char)",
-   "referenced_type" : "type-250",
-   "self_type" : "type-249",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9740,8 +9560,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, int)",
-   "referenced_type" : "type-258",
-   "self_type" : "type-257",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9749,8 +9569,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDlE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, long)",
-   "referenced_type" : "type-260",
-   "self_type" : "type-259",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDlE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDlE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9758,8 +9578,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, short)",
-   "referenced_type" : "type-256",
-   "self_type" : "type-255",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9767,8 +9587,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, unsigned short)",
-   "referenced_type" : "type-254",
-   "self_type" : "type-253",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9776,8 +9596,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jstringPKcE",
    "name" : "void (*)(_JNIEnv *, _jstring *, const char *)",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringPKcE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKcE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9785,8 +9605,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jstringPKtE",
    "name" : "void (*)(_JNIEnv *, _jstring *, const unsigned short *)",
-   "referenced_type" : "type-376",
-   "self_type" : "type-375",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringPKtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKtE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9794,8 +9614,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jstringiiPcE",
    "name" : "void (*)(_JNIEnv *, _jstring *, int, int, char *)",
-   "referenced_type" : "type-538",
-   "self_type" : "type-537",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPcE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jstringiiPcE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9803,8 +9623,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jstringiiPtE",
    "name" : "void (*)(_JNIEnv *, _jstring *, int, int, unsigned short *)",
-   "referenced_type" : "type-536",
-   "self_type" : "type-535",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jstringiiPtE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9812,8 +9632,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvPKcE",
    "name" : "void (*)(_JNIEnv *, const char *)",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "_ZTIFvP7_JNIEnvPKcE",
+   "self_type" : "_ZTIPFvP7_JNIEnvPKcE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9821,8 +9641,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvPvE",
    "name" : "void (*)(void *)",
-   "referenced_type" : "type-599",
-   "self_type" : "type-615",
+   "referenced_type" : "_ZTIFvPvE",
+   "self_type" : "_ZTIPFvPvE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9830,8 +9650,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvPvmbE",
    "name" : "void (*)(void *, unsigned long, bool)",
-   "referenced_type" : "type-676",
-   "self_type" : "type-677",
+   "referenced_type" : "_ZTIFvPvmbE",
+   "self_type" : "_ZTIPFvPvmbE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -9839,8 +9659,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK14AIBinder_Class",
    "name" : "const AIBinder_Class *",
-   "referenced_type" : "type-593",
-   "self_type" : "type-595",
+   "referenced_type" : "_ZTIK14AIBinder_Class",
+   "self_type" : "_ZTIPK14AIBinder_Class",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9848,8 +9668,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK14AIBinder_Class",
    "name" : "const AIBinder_Class *",
-   "referenced_type" : "type-703",
-   "self_type" : "type-705",
+   "referenced_type" : "_ZTIK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9857,8 +9677,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK15JNINativeMethod",
    "name" : "const JNINativeMethod *",
-   "referenced_type" : "type-513",
-   "self_type" : "type-512",
+   "referenced_type" : "_ZTIK15JNINativeMethod",
+   "self_type" : "_ZTIPK15JNINativeMethod",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9866,8 +9686,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK18JNIInvokeInterface",
    "name" : "const JNIInvokeInterface *",
-   "referenced_type" : "type-525",
-   "self_type" : "type-524",
+   "referenced_type" : "_ZTIK18JNIInvokeInterface",
+   "self_type" : "_ZTIPK18JNIInvokeInterface",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9875,8 +9695,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK18JNINativeInterface",
    "name" : "const JNINativeInterface *",
-   "referenced_type" : "type-10",
-   "self_type" : "type-9",
+   "referenced_type" : "_ZTIK18JNINativeInterface",
+   "self_type" : "_ZTIPK18JNINativeInterface",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9884,8 +9704,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK6jvalue",
    "name" : "const jvalue *",
-   "referenced_type" : "type-74",
-   "self_type" : "type-73",
+   "referenced_type" : "_ZTIK6jvalue",
+   "self_type" : "_ZTIPK6jvalue",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9893,17 +9713,17 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK7AParcel",
    "name" : "const AParcel *",
-   "referenced_type" : "type-566",
-   "self_type" : "type-568",
+   "referenced_type" : "_ZTIK7AParcel",
+   "self_type" : "_ZTIPK7AParcel",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK7AParcel",
    "name" : "const AParcel *",
-   "referenced_type" : "type-582",
-   "self_type" : "type-581",
+   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9911,26 +9731,17 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK7AParcel",
    "name" : "const AParcel *",
-   "referenced_type" : "type-640",
-   "self_type" : "type-639",
+   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
+   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "type-698",
-   "self_type" : "type-700",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK7AStatus",
    "name" : "const AStatus *",
-   "referenced_type" : "type-558",
-   "self_type" : "type-560",
+   "referenced_type" : "_ZTIK7AStatus",
+   "self_type" : "_ZTIPK7AStatus",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -9938,17 +9749,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK7AStatus",
    "name" : "const AStatus *",
-   "referenced_type" : "type-576",
-   "self_type" : "type-578",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK7AStatus",
-   "name" : "const AStatus *",
-   "referenced_type" : "type-616",
-   "self_type" : "type-618",
+   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
+   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -9956,8 +9758,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK7AStatus",
    "name" : "const AStatus *",
-   "referenced_type" : "type-689",
-   "self_type" : "type-691",
+   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
@@ -9965,8 +9767,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK8AIBinder",
    "name" : "const AIBinder *",
-   "referenced_type" : "type-597",
-   "self_type" : "type-600",
+   "referenced_type" : "_ZTIK8AIBinder",
+   "self_type" : "_ZTIPK8AIBinder",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9974,8 +9776,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK8AIBinder",
    "name" : "const AIBinder *",
-   "referenced_type" : "type-706",
-   "self_type" : "type-708",
+   "referenced_type" : "_ZTIK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9983,8 +9785,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKDs",
    "name" : "const char16_t *",
-   "referenced_type" : "type-654",
-   "self_type" : "type-655",
+   "referenced_type" : "_ZTIKDs",
+   "self_type" : "_ZTIPKDs",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -9992,8 +9794,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKa",
    "name" : "const signed char *",
-   "referenced_type" : "type-25",
-   "self_type" : "type-24",
+   "referenced_type" : "_ZTIKa",
+   "self_type" : "_ZTIPKa",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10001,8 +9803,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKc",
    "name" : "const char *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
+   "referenced_type" : "_ZTIKc",
+   "self_type" : "_ZTIPKc",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10010,8 +9812,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKd",
    "name" : "const double *",
-   "referenced_type" : "type-509",
-   "self_type" : "type-508",
+   "referenced_type" : "_ZTIKd",
+   "self_type" : "_ZTIPKd",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10019,8 +9821,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKf",
    "name" : "const float *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-504",
+   "referenced_type" : "_ZTIKf",
+   "self_type" : "_ZTIPKf",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10028,8 +9830,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKh",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-485",
-   "self_type" : "type-484",
+   "referenced_type" : "_ZTIKh",
+   "self_type" : "_ZTIPKh",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10037,8 +9839,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKi",
    "name" : "const int *",
-   "referenced_type" : "type-497",
-   "self_type" : "type-496",
+   "referenced_type" : "_ZTIKi",
+   "self_type" : "_ZTIPKi",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10046,8 +9848,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKj",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-648",
-   "self_type" : "type-649",
+   "referenced_type" : "_ZTIKj",
+   "self_type" : "_ZTIPKj",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10055,8 +9857,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKl",
    "name" : "const long *",
-   "referenced_type" : "type-501",
-   "self_type" : "type-500",
+   "referenced_type" : "_ZTIKl",
+   "self_type" : "_ZTIPKl",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10064,8 +9866,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKm",
    "name" : "const unsigned long *",
-   "referenced_type" : "type-650",
-   "self_type" : "type-651",
+   "referenced_type" : "_ZTIKm",
+   "self_type" : "_ZTIPKm",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10073,8 +9875,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKs",
    "name" : "const short *",
-   "referenced_type" : "type-493",
-   "self_type" : "type-492",
+   "referenced_type" : "_ZTIKs",
+   "self_type" : "_ZTIPKs",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10082,8 +9884,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKt",
    "name" : "const unsigned short *",
-   "referenced_type" : "type-369",
-   "self_type" : "type-368",
+   "referenced_type" : "_ZTIKt",
+   "self_type" : "_ZTIPKt",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10091,8 +9893,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKv",
    "name" : "const void *",
-   "referenced_type" : "type-625",
-   "self_type" : "type-626",
+   "referenced_type" : "_ZTIKv",
+   "self_type" : "_ZTIPKv",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10100,8 +9902,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP7AParcel",
    "name" : "AParcel **",
-   "referenced_type" : "type-584",
-   "self_type" : "type-603",
+   "referenced_type" : "_ZTIP7AParcel",
+   "self_type" : "_ZTIPP7AParcel",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10109,8 +9911,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP7AParcel",
    "name" : "AParcel **",
-   "referenced_type" : "type-701",
-   "self_type" : "type-711",
+   "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10118,8 +9920,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP7AStatus",
    "name" : "AStatus **",
-   "referenced_type" : "type-561",
-   "self_type" : "type-563",
+   "referenced_type" : "_ZTIP7AStatus",
+   "self_type" : "_ZTIPP7AStatus",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10127,8 +9929,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP7AStatus",
    "name" : "AStatus **",
-   "referenced_type" : "type-619",
-   "self_type" : "type-621",
+   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
+   "self_type" : "_ZTIPP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10136,8 +9938,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP7_JNIEnv",
    "name" : "_JNIEnv **",
-   "referenced_type" : "type-7",
-   "self_type" : "type-531",
+   "referenced_type" : "_ZTIP7_JNIEnv",
+   "self_type" : "_ZTIPP7_JNIEnv",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10145,8 +9947,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP7_JavaVM",
    "name" : "_JavaVM **",
-   "referenced_type" : "type-522",
-   "self_type" : "type-521",
+   "referenced_type" : "_ZTIP7_JavaVM",
+   "self_type" : "_ZTIPP7_JavaVM",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10154,17 +9956,17 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP8AIBinder",
    "name" : "AIBinder **",
-   "referenced_type" : "type-569",
-   "self_type" : "type-571",
+   "referenced_type" : "_ZTIP8AIBinder",
+   "self_type" : "_ZTIPP8AIBinder",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP8AIBinder",
    "name" : "AIBinder **",
-   "referenced_type" : "type-588",
-   "self_type" : "type-606",
+   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10172,26 +9974,17 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP8AIBinder",
    "name" : "AIBinder **",
-   "referenced_type" : "type-667",
-   "self_type" : "type-678",
+   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
+   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm64_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "type-696",
-   "self_type" : "type-714",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPPDs",
    "name" : "char16_t **",
-   "referenced_type" : "type-647",
-   "self_type" : "type-680",
+   "referenced_type" : "_ZTIPDs",
+   "self_type" : "_ZTIPPDs",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10199,8 +9992,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPPKc",
    "name" : "const char **",
-   "referenced_type" : "type-21",
-   "self_type" : "type-591",
+   "referenced_type" : "_ZTIPKc",
+   "self_type" : "_ZTIPPKc",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10208,8 +10001,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPPa",
    "name" : "signed char **",
-   "referenced_type" : "type-431",
-   "self_type" : "type-683",
+   "referenced_type" : "_ZTIPa",
+   "self_type" : "_ZTIPPa",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10217,8 +10010,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPPc",
    "name" : "char **",
-   "referenced_type" : "type-539",
-   "self_type" : "type-623",
+   "referenced_type" : "_ZTIPc",
+   "self_type" : "_ZTIPPc",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10226,8 +10019,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPPd",
    "name" : "double **",
-   "referenced_type" : "type-449",
-   "self_type" : "type-674",
+   "referenced_type" : "_ZTIPd",
+   "self_type" : "_ZTIPPd",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10235,8 +10028,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPPf",
    "name" : "float **",
-   "referenced_type" : "type-446",
-   "self_type" : "type-671",
+   "referenced_type" : "_ZTIPf",
+   "self_type" : "_ZTIPPf",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10244,8 +10037,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPPi",
    "name" : "int **",
-   "referenced_type" : "type-440",
-   "self_type" : "type-657",
+   "referenced_type" : "_ZTIPi",
+   "self_type" : "_ZTIPPi",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10253,8 +10046,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPPj",
    "name" : "unsigned int **",
-   "referenced_type" : "type-644",
-   "self_type" : "type-660",
+   "referenced_type" : "_ZTIPj",
+   "self_type" : "_ZTIPPj",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10262,8 +10055,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPPl",
    "name" : "long **",
-   "referenced_type" : "type-443",
-   "self_type" : "type-663",
+   "referenced_type" : "_ZTIPl",
+   "self_type" : "_ZTIPPl",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10271,8 +10064,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPPm",
    "name" : "unsigned long **",
-   "referenced_type" : "type-645",
-   "self_type" : "type-666",
+   "referenced_type" : "_ZTIPm",
+   "self_type" : "_ZTIPPm",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10280,8 +10073,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPPv",
    "name" : "void **",
-   "referenced_type" : "type-12",
-   "self_type" : "type-534",
+   "referenced_type" : "_ZTIPv",
+   "self_type" : "_ZTIPPv",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10289,8 +10082,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPa",
    "name" : "signed char *",
-   "referenced_type" : "type-26",
-   "self_type" : "type-431",
+   "referenced_type" : "_ZTIa",
+   "self_type" : "_ZTIPa",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10298,8 +10091,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPb",
    "name" : "bool *",
-   "referenced_type" : "type-596",
-   "self_type" : "type-646",
+   "referenced_type" : "_ZTIb",
+   "self_type" : "_ZTIPb",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10307,8 +10100,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPc",
    "name" : "char *",
-   "referenced_type" : "type-23",
-   "self_type" : "type-539",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIPc",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10316,8 +10109,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPd",
    "name" : "double *",
-   "referenced_type" : "type-80",
-   "self_type" : "type-449",
+   "referenced_type" : "_ZTId",
+   "self_type" : "_ZTIPd",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10325,8 +10118,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPf",
    "name" : "float *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-446",
+   "referenced_type" : "_ZTIf",
+   "self_type" : "_ZTIPf",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10334,8 +10127,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPh",
    "name" : "unsigned char *",
-   "referenced_type" : "type-39",
-   "self_type" : "type-374",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIPh",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10343,8 +10136,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPi",
    "name" : "int *",
-   "referenced_type" : "type-16",
-   "self_type" : "type-440",
+   "referenced_type" : "_ZTIi",
+   "self_type" : "_ZTIPi",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10352,8 +10145,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPj",
    "name" : "unsigned int *",
-   "referenced_type" : "type-555",
-   "self_type" : "type-644",
+   "referenced_type" : "_ZTIj",
+   "self_type" : "_ZTIPj",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10361,8 +10154,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPl",
    "name" : "long *",
-   "referenced_type" : "type-78",
-   "self_type" : "type-443",
+   "referenced_type" : "_ZTIl",
+   "self_type" : "_ZTIPl",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10370,8 +10163,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPm",
    "name" : "unsigned long *",
-   "referenced_type" : "type-628",
-   "self_type" : "type-645",
+   "referenced_type" : "_ZTIm",
+   "self_type" : "_ZTIPm",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10379,8 +10172,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPs",
    "name" : "short *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-437",
+   "referenced_type" : "_ZTIs",
+   "self_type" : "_ZTIPs",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10388,8 +10181,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPt",
    "name" : "unsigned short *",
-   "referenced_type" : "type-76",
-   "self_type" : "type-434",
+   "referenced_type" : "_ZTIt",
+   "self_type" : "_ZTIPt",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10397,8 +10190,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPv",
    "name" : "void *",
-   "referenced_type" : "type-13",
-   "self_type" : "type-12",
+   "referenced_type" : "_ZTIv",
+   "self_type" : "_ZTIPv",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   }
@@ -10410,18 +10203,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK14AIBinder_Class",
    "name" : "const AIBinder_Class",
-   "referenced_type" : "type-594",
-   "self_type" : "type-593",
-   "size" : 40,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK14AIBinder_Class",
-   "name" : "const AIBinder_Class",
-   "referenced_type" : "type-704",
-   "self_type" : "type-703",
+   "referenced_type" : "_ZTI14AIBinder_Class",
+   "self_type" : "_ZTIK14AIBinder_Class",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10430,8 +10213,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK15JNINativeMethod",
    "name" : "const JNINativeMethod",
-   "referenced_type" : "type-514",
-   "self_type" : "type-513",
+   "referenced_type" : "_ZTI15JNINativeMethod",
+   "self_type" : "_ZTIK15JNINativeMethod",
    "size" : 24,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10440,8 +10223,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK18JNIInvokeInterface",
    "name" : "const JNIInvokeInterface",
-   "referenced_type" : "type-526",
-   "self_type" : "type-525",
+   "referenced_type" : "_ZTI18JNIInvokeInterface",
+   "self_type" : "_ZTIK18JNIInvokeInterface",
    "size" : 64,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10450,8 +10233,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK18JNINativeInterface",
    "name" : "const JNINativeInterface",
-   "referenced_type" : "type-11",
-   "self_type" : "type-10",
+   "referenced_type" : "_ZTI18JNINativeInterface",
+   "self_type" : "_ZTIK18JNINativeInterface",
    "size" : 1864,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10460,8 +10243,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK6jvalue",
    "name" : "const jvalue",
-   "referenced_type" : "type-75",
-   "self_type" : "type-74",
+   "referenced_type" : "_ZTI6jvalue",
+   "self_type" : "_ZTIK6jvalue",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10470,38 +10253,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK7AParcel",
    "name" : "const AParcel",
-   "referenced_type" : "type-567",
-   "self_type" : "type-566",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AParcel",
-   "name" : "const AParcel",
-   "referenced_type" : "type-583",
-   "self_type" : "type-582",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AParcel",
-   "name" : "const AParcel",
-   "referenced_type" : "type-641",
-   "self_type" : "type-640",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AParcel",
-   "name" : "const AParcel",
-   "referenced_type" : "type-699",
-   "self_type" : "type-698",
+   "referenced_type" : "_ZTI7AParcel",
+   "self_type" : "_ZTIK7AParcel",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10510,58 +10263,18 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK7AStatus",
    "name" : "const AStatus",
-   "referenced_type" : "type-559",
-   "self_type" : "type-558",
+   "referenced_type" : "_ZTI7AStatus",
+   "self_type" : "_ZTIK7AStatus",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIK7AStatus",
-   "name" : "const AStatus",
-   "referenced_type" : "type-577",
-   "self_type" : "type-576",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AStatus",
-   "name" : "const AStatus",
-   "referenced_type" : "type-617",
-   "self_type" : "type-616",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AStatus",
-   "name" : "const AStatus",
-   "referenced_type" : "type-690",
-   "self_type" : "type-689",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK8AIBinder",
-   "name" : "const AIBinder",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "_ZTIK8AIBinder",
    "name" : "const AIBinder",
-   "referenced_type" : "type-707",
-   "self_type" : "type-706",
+   "referenced_type" : "_ZTI8AIBinder",
+   "self_type" : "_ZTIK8AIBinder",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10570,8 +10283,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKDs",
    "name" : "const char16_t",
-   "referenced_type" : "type-643",
-   "self_type" : "type-654",
+   "referenced_type" : "_ZTIDs",
+   "self_type" : "_ZTIKDs",
    "size" : 2,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10580,8 +10293,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKa",
    "name" : "const signed char",
-   "referenced_type" : "type-26",
-   "self_type" : "type-25",
+   "referenced_type" : "_ZTIa",
+   "self_type" : "_ZTIKa",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10590,8 +10303,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKc",
    "name" : "const char",
-   "referenced_type" : "type-23",
-   "self_type" : "type-22",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIKc",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10600,8 +10313,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKd",
    "name" : "const double",
-   "referenced_type" : "type-80",
-   "self_type" : "type-509",
+   "referenced_type" : "_ZTId",
+   "self_type" : "_ZTIKd",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10610,8 +10323,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKf",
    "name" : "const float",
-   "referenced_type" : "type-79",
-   "self_type" : "type-505",
+   "referenced_type" : "_ZTIf",
+   "self_type" : "_ZTIKf",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10620,8 +10333,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKh",
    "name" : "const unsigned char",
-   "referenced_type" : "type-39",
-   "self_type" : "type-485",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIKh",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10630,8 +10343,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKi",
    "name" : "const int",
-   "referenced_type" : "type-16",
-   "self_type" : "type-497",
+   "referenced_type" : "_ZTIi",
+   "self_type" : "_ZTIKi",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10640,8 +10353,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKj",
    "name" : "const unsigned int",
-   "referenced_type" : "type-555",
-   "self_type" : "type-648",
+   "referenced_type" : "_ZTIj",
+   "self_type" : "_ZTIKj",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10650,8 +10363,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKl",
    "name" : "const long",
-   "referenced_type" : "type-78",
-   "self_type" : "type-501",
+   "referenced_type" : "_ZTIl",
+   "self_type" : "_ZTIKl",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10660,8 +10373,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKm",
    "name" : "const unsigned long",
-   "referenced_type" : "type-628",
-   "self_type" : "type-650",
+   "referenced_type" : "_ZTIm",
+   "self_type" : "_ZTIKm",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10670,8 +10383,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKs",
    "name" : "const short",
-   "referenced_type" : "type-77",
-   "self_type" : "type-493",
+   "referenced_type" : "_ZTIs",
+   "self_type" : "_ZTIKs",
    "size" : 2,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10680,8 +10393,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKt",
    "name" : "const unsigned short",
-   "referenced_type" : "type-76",
-   "self_type" : "type-369",
+   "referenced_type" : "_ZTIt",
+   "self_type" : "_ZTIKt",
    "size" : 2,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10689,8 +10402,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKv",
    "name" : "const void",
-   "referenced_type" : "type-13",
-   "self_type" : "type-625",
+   "referenced_type" : "_ZTIv",
+   "self_type" : "_ZTIKv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   }
  ],
@@ -10701,14 +10414,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI10_jintArray",
    "name" : "_jintArray",
    "record_kind" : "class",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "_ZTI10_jintArray",
+   "self_type" : "_ZTI10_jintArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10717,14 +10430,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI11_jbyteArray",
    "name" : "_jbyteArray",
    "record_kind" : "class",
-   "referenced_type" : "type-402",
-   "self_type" : "type-402",
+   "referenced_type" : "_ZTI11_jbyteArray",
+   "self_type" : "_ZTI11_jbyteArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10733,14 +10446,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI11_jcharArray",
    "name" : "_jcharArray",
    "record_kind" : "class",
-   "referenced_type" : "type-406",
-   "self_type" : "type-406",
+   "referenced_type" : "_ZTI11_jcharArray",
+   "self_type" : "_ZTI11_jcharArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10749,14 +10462,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI11_jlongArray",
    "name" : "_jlongArray",
    "record_kind" : "class",
-   "referenced_type" : "type-418",
-   "self_type" : "type-418",
+   "referenced_type" : "_ZTI11_jlongArray",
+   "self_type" : "_ZTI11_jlongArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10765,14 +10478,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTI8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI11_jthrowable",
    "name" : "_jthrowable",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "_ZTI11_jthrowable",
+   "self_type" : "_ZTI11_jthrowable",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10782,18 +10495,18 @@
    [
     {
      "field_name" : "optionString",
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "field_name" : "extraInfo",
      "field_offset" : 64,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
    "linker_set_key" : "_ZTI12JavaVMOption",
    "name" : "JavaVMOption",
-   "referenced_type" : "type-610",
-   "self_type" : "type-610",
+   "referenced_type" : "_ZTI12JavaVMOption",
+   "self_type" : "_ZTI12JavaVMOption",
    "size" : 16,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10802,14 +10515,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI12_jfloatArray",
    "name" : "_jfloatArray",
    "record_kind" : "class",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
+   "referenced_type" : "_ZTI12_jfloatArray",
+   "self_type" : "_ZTI12_jfloatArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10818,14 +10531,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI12_jshortArray",
    "name" : "_jshortArray",
    "record_kind" : "class",
-   "referenced_type" : "type-410",
-   "self_type" : "type-410",
+   "referenced_type" : "_ZTI12_jshortArray",
+   "self_type" : "_ZTI12_jshortArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10834,14 +10547,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI13_jdoubleArray",
    "name" : "_jdoubleArray",
    "record_kind" : "class",
-   "referenced_type" : "type-426",
-   "self_type" : "type-426",
+   "referenced_type" : "_ZTI13_jdoubleArray",
+   "self_type" : "_ZTI13_jdoubleArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10850,14 +10563,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI13_jobjectArray",
    "name" : "_jobjectArray",
    "record_kind" : "class",
-   "referenced_type" : "type-390",
-   "self_type" : "type-390",
+   "referenced_type" : "_ZTI13_jobjectArray",
+   "self_type" : "_ZTI13_jobjectArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10867,28 +10580,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "nOptions",
      "field_offset" : 32,
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "options",
      "field_offset" : 64,
-     "referenced_type" : "type-612"
+     "referenced_type" : "_ZTIP12JavaVMOption"
     },
     {
      "field_name" : "ignoreUnrecognized",
      "field_offset" : 128,
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     }
    ],
    "linker_set_key" : "_ZTI14JavaVMInitArgs",
    "name" : "JavaVMInitArgs",
-   "referenced_type" : "type-611",
-   "self_type" : "type-611",
+   "referenced_type" : "_ZTI14JavaVMInitArgs",
+   "self_type" : "_ZTI14JavaVMInitArgs",
    "size" : 24,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10897,14 +10610,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI14_jbooleanArray",
    "name" : "_jbooleanArray",
    "record_kind" : "class",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
+   "referenced_type" : "_ZTI14_jbooleanArray",
+   "self_type" : "_ZTI14_jbooleanArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10914,23 +10627,23 @@
    [
     {
      "field_name" : "name",
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "field_name" : "signature",
      "field_offset" : 64,
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "field_name" : "fnPtr",
      "field_offset" : 128,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
    "linker_set_key" : "_ZTI15JNINativeMethod",
    "name" : "JNINativeMethod",
-   "referenced_type" : "type-514",
-   "self_type" : "type-514",
+   "referenced_type" : "_ZTI15JNINativeMethod",
+   "self_type" : "_ZTI15JNINativeMethod",
    "size" : 24,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10940,23 +10653,23 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "name",
      "field_offset" : 64,
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "field_name" : "group",
      "field_offset" : 128,
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI16JavaVMAttachArgs",
    "name" : "JavaVMAttachArgs",
-   "referenced_type" : "type-609",
-   "self_type" : "type-609",
+   "referenced_type" : "_ZTI16JavaVMAttachArgs",
+   "self_type" : "_ZTI16JavaVMAttachArgs",
    "size" : 24,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10966,48 +10679,48 @@
    [
     {
      "field_name" : "reserved0",
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved1",
      "field_offset" : 64,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved2",
      "field_offset" : 128,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "DestroyJavaVM",
      "field_offset" : 192,
-     "referenced_type" : "type-527"
+     "referenced_type" : "_ZTIPFiP7_JavaVME"
     },
     {
      "field_name" : "AttachCurrentThread",
      "field_offset" : 256,
-     "referenced_type" : "type-529"
+     "referenced_type" : "_ZTIPFiP7_JavaVMPP7_JNIEnvPvE"
     },
     {
      "field_name" : "DetachCurrentThread",
      "field_offset" : 320,
-     "referenced_type" : "type-527"
+     "referenced_type" : "_ZTIPFiP7_JavaVME"
     },
     {
      "field_name" : "GetEnv",
      "field_offset" : 384,
-     "referenced_type" : "type-532"
+     "referenced_type" : "_ZTIPFiP7_JavaVMPPviE"
     },
     {
      "field_name" : "AttachCurrentThreadAsDaemon",
      "field_offset" : 448,
-     "referenced_type" : "type-529"
+     "referenced_type" : "_ZTIPFiP7_JavaVMPP7_JNIEnvPvE"
     }
    ],
    "linker_set_key" : "_ZTI18JNIInvokeInterface",
    "name" : "JNIInvokeInterface",
-   "referenced_type" : "type-526",
-   "self_type" : "type-526",
+   "referenced_type" : "_ZTI18JNIInvokeInterface",
+   "self_type" : "_ZTI18JNIInvokeInterface",
    "size" : 64,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -11017,1173 +10730,1173 @@
    [
     {
      "field_name" : "reserved0",
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved1",
      "field_offset" : 64,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved2",
      "field_offset" : 128,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved3",
      "field_offset" : 192,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "GetVersion",
      "field_offset" : 256,
-     "referenced_type" : "type-14"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvE"
     },
     {
      "field_name" : "DefineClass",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "_ZTIPFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE"
     },
     {
      "field_name" : "FindClass",
      "field_offset" : 384,
-     "referenced_type" : "type-27"
+     "referenced_type" : "_ZTIPFP7_jclassP7_JNIEnvPKcE"
     },
     {
      "field_name" : "FromReflectedMethod",
      "field_offset" : 448,
-     "referenced_type" : "type-29"
+     "referenced_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "FromReflectedField",
      "field_offset" : 512,
-     "referenced_type" : "type-33"
+     "referenced_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "ToReflectedMethod",
      "field_offset" : 576,
-     "referenced_type" : "type-37"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE"
     },
     {
      "field_name" : "GetSuperclass",
      "field_offset" : 640,
-     "referenced_type" : "type-40"
+     "referenced_type" : "_ZTIPFP7_jclassP7_JNIEnvS0_E"
     },
     {
      "field_name" : "IsAssignableFrom",
      "field_offset" : 704,
-     "referenced_type" : "type-42"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassS2_E"
     },
     {
      "field_name" : "ToReflectedField",
      "field_offset" : 768,
-     "referenced_type" : "type-44"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE"
     },
     {
      "field_name" : "Throw",
      "field_offset" : 832,
-     "referenced_type" : "type-46"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP11_jthrowableE"
     },
     {
      "field_name" : "ThrowNew",
      "field_offset" : 896,
-     "referenced_type" : "type-50"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassPKcE"
     },
     {
      "field_name" : "ExceptionOccurred",
      "field_offset" : 960,
-     "referenced_type" : "type-52"
+     "referenced_type" : "_ZTIPFP11_jthrowableP7_JNIEnvE"
     },
     {
      "field_name" : "ExceptionDescribe",
      "field_offset" : 1024,
-     "referenced_type" : "type-54"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvE"
     },
     {
      "field_name" : "ExceptionClear",
      "field_offset" : 1088,
-     "referenced_type" : "type-54"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvE"
     },
     {
      "field_name" : "FatalError",
      "field_offset" : 1152,
-     "referenced_type" : "type-56"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvPKcE"
     },
     {
      "field_name" : "PushLocalFrame",
      "field_offset" : 1216,
-     "referenced_type" : "type-58"
+     "referenced_type" : "_ZTIPFiP7_JNIEnviE"
     },
     {
      "field_name" : "PopLocalFrame",
      "field_offset" : 1280,
-     "referenced_type" : "type-60"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E"
     },
     {
      "field_name" : "NewGlobalRef",
      "field_offset" : 1344,
-     "referenced_type" : "type-60"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E"
     },
     {
      "field_name" : "DeleteGlobalRef",
      "field_offset" : 1408,
-     "referenced_type" : "type-62"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "DeleteLocalRef",
      "field_offset" : 1472,
-     "referenced_type" : "type-62"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "IsSameObject",
      "field_offset" : 1536,
-     "referenced_type" : "type-64"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectS2_E"
     },
     {
      "field_name" : "NewLocalRef",
      "field_offset" : 1600,
-     "referenced_type" : "type-60"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E"
     },
     {
      "field_name" : "EnsureLocalCapacity",
      "field_offset" : 1664,
-     "referenced_type" : "type-58"
+     "referenced_type" : "_ZTIPFiP7_JNIEnviE"
     },
     {
      "field_name" : "AllocObject",
      "field_offset" : 1728,
-     "referenced_type" : "type-3"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassE"
     },
     {
      "field_name" : "NewObject",
      "field_offset" : 1792,
-     "referenced_type" : "type-66"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "NewObjectV",
      "field_offset" : 1856,
-     "referenced_type" : "type-68"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "NewObjectA",
      "field_offset" : 1920,
-     "referenced_type" : "type-71"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "GetObjectClass",
      "field_offset" : 1984,
-     "referenced_type" : "type-81"
+     "referenced_type" : "_ZTIPFP7_jclassP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "IsInstanceOf",
      "field_offset" : 2048,
-     "referenced_type" : "type-83"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassE"
     },
     {
      "field_name" : "GetMethodID",
      "field_offset" : 2112,
-     "referenced_type" : "type-85"
+     "referenced_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E"
     },
     {
      "field_name" : "CallObjectMethod",
      "field_offset" : 2176,
-     "referenced_type" : "type-87"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE"
     },
     {
      "field_name" : "CallObjectMethodV",
      "field_offset" : 2240,
-     "referenced_type" : "type-89"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallObjectMethodA",
      "field_offset" : 2304,
-     "referenced_type" : "type-92"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallBooleanMethod",
      "field_offset" : 2368,
-     "referenced_type" : "type-94"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallBooleanMethodV",
      "field_offset" : 2432,
-     "referenced_type" : "type-96"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallBooleanMethodA",
      "field_offset" : 2496,
-     "referenced_type" : "type-99"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallByteMethod",
      "field_offset" : 2560,
-     "referenced_type" : "type-101"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallByteMethodV",
      "field_offset" : 2624,
-     "referenced_type" : "type-103"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallByteMethodA",
      "field_offset" : 2688,
-     "referenced_type" : "type-106"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallCharMethod",
      "field_offset" : 2752,
-     "referenced_type" : "type-108"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallCharMethodV",
      "field_offset" : 2816,
-     "referenced_type" : "type-110"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallCharMethodA",
      "field_offset" : 2880,
-     "referenced_type" : "type-113"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallShortMethod",
      "field_offset" : 2944,
-     "referenced_type" : "type-115"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallShortMethodV",
      "field_offset" : 3008,
-     "referenced_type" : "type-117"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallShortMethodA",
      "field_offset" : 3072,
-     "referenced_type" : "type-120"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallIntMethod",
      "field_offset" : 3136,
-     "referenced_type" : "type-122"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallIntMethodV",
      "field_offset" : 3200,
-     "referenced_type" : "type-124"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallIntMethodA",
      "field_offset" : 3264,
-     "referenced_type" : "type-127"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallLongMethod",
      "field_offset" : 3328,
-     "referenced_type" : "type-129"
+     "referenced_type" : "_ZTIPFlP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallLongMethodV",
      "field_offset" : 3392,
-     "referenced_type" : "type-131"
+     "referenced_type" : "_ZTIPFlP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallLongMethodA",
      "field_offset" : 3456,
-     "referenced_type" : "type-134"
+     "referenced_type" : "_ZTIPFlP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallFloatMethod",
      "field_offset" : 3520,
-     "referenced_type" : "type-136"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallFloatMethodV",
      "field_offset" : 3584,
-     "referenced_type" : "type-138"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallFloatMethodA",
      "field_offset" : 3648,
-     "referenced_type" : "type-141"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallDoubleMethod",
      "field_offset" : 3712,
-     "referenced_type" : "type-143"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallDoubleMethodV",
      "field_offset" : 3776,
-     "referenced_type" : "type-145"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallDoubleMethodA",
      "field_offset" : 3840,
-     "referenced_type" : "type-148"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallVoidMethod",
      "field_offset" : 3904,
-     "referenced_type" : "type-150"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallVoidMethodV",
      "field_offset" : 3968,
-     "referenced_type" : "type-152"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallVoidMethodA",
      "field_offset" : 4032,
-     "referenced_type" : "type-155"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualObjectMethod",
      "field_offset" : 4096,
-     "referenced_type" : "type-157"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualObjectMethodV",
      "field_offset" : 4160,
-     "referenced_type" : "type-159"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualObjectMethodA",
      "field_offset" : 4224,
-     "referenced_type" : "type-162"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualBooleanMethod",
      "field_offset" : 4288,
-     "referenced_type" : "type-164"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualBooleanMethodV",
      "field_offset" : 4352,
-     "referenced_type" : "type-166"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualBooleanMethodA",
      "field_offset" : 4416,
-     "referenced_type" : "type-169"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualByteMethod",
      "field_offset" : 4480,
-     "referenced_type" : "type-171"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualByteMethodV",
      "field_offset" : 4544,
-     "referenced_type" : "type-173"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualByteMethodA",
      "field_offset" : 4608,
-     "referenced_type" : "type-176"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualCharMethod",
      "field_offset" : 4672,
-     "referenced_type" : "type-178"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualCharMethodV",
      "field_offset" : 4736,
-     "referenced_type" : "type-180"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualCharMethodA",
      "field_offset" : 4800,
-     "referenced_type" : "type-183"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualShortMethod",
      "field_offset" : 4864,
-     "referenced_type" : "type-185"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualShortMethodV",
      "field_offset" : 4928,
-     "referenced_type" : "type-187"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualShortMethodA",
      "field_offset" : 4992,
-     "referenced_type" : "type-190"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualIntMethod",
      "field_offset" : 5056,
-     "referenced_type" : "type-192"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualIntMethodV",
      "field_offset" : 5120,
-     "referenced_type" : "type-194"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualIntMethodA",
      "field_offset" : 5184,
-     "referenced_type" : "type-197"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualLongMethod",
      "field_offset" : 5248,
-     "referenced_type" : "type-199"
+     "referenced_type" : "_ZTIPFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualLongMethodV",
      "field_offset" : 5312,
-     "referenced_type" : "type-201"
+     "referenced_type" : "_ZTIPFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualLongMethodA",
      "field_offset" : 5376,
-     "referenced_type" : "type-204"
+     "referenced_type" : "_ZTIPFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualFloatMethod",
      "field_offset" : 5440,
-     "referenced_type" : "type-206"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualFloatMethodV",
      "field_offset" : 5504,
-     "referenced_type" : "type-208"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualFloatMethodA",
      "field_offset" : 5568,
-     "referenced_type" : "type-211"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualDoubleMethod",
      "field_offset" : 5632,
-     "referenced_type" : "type-213"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualDoubleMethodV",
      "field_offset" : 5696,
-     "referenced_type" : "type-215"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualDoubleMethodA",
      "field_offset" : 5760,
-     "referenced_type" : "type-218"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualVoidMethod",
      "field_offset" : 5824,
-     "referenced_type" : "type-220"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualVoidMethodV",
      "field_offset" : 5888,
-     "referenced_type" : "type-222"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualVoidMethodA",
      "field_offset" : 5952,
-     "referenced_type" : "type-225"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "GetFieldID",
      "field_offset" : 6016,
-     "referenced_type" : "type-227"
+     "referenced_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E"
     },
     {
      "field_name" : "GetObjectField",
      "field_offset" : 6080,
-     "referenced_type" : "type-229"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE"
     },
     {
      "field_name" : "GetBooleanField",
      "field_offset" : 6144,
-     "referenced_type" : "type-231"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetByteField",
      "field_offset" : 6208,
-     "referenced_type" : "type-233"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetCharField",
      "field_offset" : 6272,
-     "referenced_type" : "type-235"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetShortField",
      "field_offset" : 6336,
-     "referenced_type" : "type-237"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetIntField",
      "field_offset" : 6400,
-     "referenced_type" : "type-239"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetLongField",
      "field_offset" : 6464,
-     "referenced_type" : "type-241"
+     "referenced_type" : "_ZTIPFlP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetFloatField",
      "field_offset" : 6528,
-     "referenced_type" : "type-243"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetDoubleField",
      "field_offset" : 6592,
-     "referenced_type" : "type-245"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "SetObjectField",
      "field_offset" : 6656,
-     "referenced_type" : "type-247"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E"
     },
     {
      "field_name" : "SetBooleanField",
      "field_offset" : 6720,
-     "referenced_type" : "type-249"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDhE"
     },
     {
      "field_name" : "SetByteField",
      "field_offset" : 6784,
-     "referenced_type" : "type-251"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDaE"
     },
     {
      "field_name" : "SetCharField",
      "field_offset" : 6848,
-     "referenced_type" : "type-253"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDtE"
     },
     {
      "field_name" : "SetShortField",
      "field_offset" : 6912,
-     "referenced_type" : "type-255"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDsE"
     },
     {
      "field_name" : "SetIntField",
      "field_offset" : 6976,
-     "referenced_type" : "type-257"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDiE"
     },
     {
      "field_name" : "SetLongField",
      "field_offset" : 7040,
-     "referenced_type" : "type-259"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDlE"
     },
     {
      "field_name" : "SetFloatField",
      "field_offset" : 7104,
-     "referenced_type" : "type-261"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDfE"
     },
     {
      "field_name" : "SetDoubleField",
      "field_offset" : 7168,
-     "referenced_type" : "type-263"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDdE"
     },
     {
      "field_name" : "GetStaticMethodID",
      "field_offset" : 7232,
-     "referenced_type" : "type-85"
+     "referenced_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E"
     },
     {
      "field_name" : "CallStaticObjectMethod",
      "field_offset" : 7296,
-     "referenced_type" : "type-66"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticObjectMethodV",
      "field_offset" : 7360,
-     "referenced_type" : "type-68"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticObjectMethodA",
      "field_offset" : 7424,
-     "referenced_type" : "type-71"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticBooleanMethod",
      "field_offset" : 7488,
-     "referenced_type" : "type-265"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticBooleanMethodV",
      "field_offset" : 7552,
-     "referenced_type" : "type-267"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticBooleanMethodA",
      "field_offset" : 7616,
-     "referenced_type" : "type-270"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticByteMethod",
      "field_offset" : 7680,
-     "referenced_type" : "type-272"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticByteMethodV",
      "field_offset" : 7744,
-     "referenced_type" : "type-274"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticByteMethodA",
      "field_offset" : 7808,
-     "referenced_type" : "type-277"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticCharMethod",
      "field_offset" : 7872,
-     "referenced_type" : "type-279"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticCharMethodV",
      "field_offset" : 7936,
-     "referenced_type" : "type-281"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticCharMethodA",
      "field_offset" : 8000,
-     "referenced_type" : "type-284"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticShortMethod",
      "field_offset" : 8064,
-     "referenced_type" : "type-286"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticShortMethodV",
      "field_offset" : 8128,
-     "referenced_type" : "type-288"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticShortMethodA",
      "field_offset" : 8192,
-     "referenced_type" : "type-291"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticIntMethod",
      "field_offset" : 8256,
-     "referenced_type" : "type-293"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticIntMethodV",
      "field_offset" : 8320,
-     "referenced_type" : "type-295"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticIntMethodA",
      "field_offset" : 8384,
-     "referenced_type" : "type-298"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticLongMethod",
      "field_offset" : 8448,
-     "referenced_type" : "type-300"
+     "referenced_type" : "_ZTIPFlP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticLongMethodV",
      "field_offset" : 8512,
-     "referenced_type" : "type-302"
+     "referenced_type" : "_ZTIPFlP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticLongMethodA",
      "field_offset" : 8576,
-     "referenced_type" : "type-305"
+     "referenced_type" : "_ZTIPFlP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticFloatMethod",
      "field_offset" : 8640,
-     "referenced_type" : "type-307"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticFloatMethodV",
      "field_offset" : 8704,
-     "referenced_type" : "type-309"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticFloatMethodA",
      "field_offset" : 8768,
-     "referenced_type" : "type-312"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticDoubleMethod",
      "field_offset" : 8832,
-     "referenced_type" : "type-314"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticDoubleMethodV",
      "field_offset" : 8896,
-     "referenced_type" : "type-316"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticDoubleMethodA",
      "field_offset" : 8960,
-     "referenced_type" : "type-319"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticVoidMethod",
      "field_offset" : 9024,
-     "referenced_type" : "type-321"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticVoidMethodV",
      "field_offset" : 9088,
-     "referenced_type" : "type-323"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticVoidMethodA",
      "field_offset" : 9152,
-     "referenced_type" : "type-326"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "GetStaticFieldID",
      "field_offset" : 9216,
-     "referenced_type" : "type-227"
+     "referenced_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E"
     },
     {
      "field_name" : "GetStaticObjectField",
      "field_offset" : 9280,
-     "referenced_type" : "type-328"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticBooleanField",
      "field_offset" : 9344,
-     "referenced_type" : "type-330"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticByteField",
      "field_offset" : 9408,
-     "referenced_type" : "type-332"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticCharField",
      "field_offset" : 9472,
-     "referenced_type" : "type-334"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticShortField",
      "field_offset" : 9536,
-     "referenced_type" : "type-336"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticIntField",
      "field_offset" : 9600,
-     "referenced_type" : "type-338"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticLongField",
      "field_offset" : 9664,
-     "referenced_type" : "type-340"
+     "referenced_type" : "_ZTIPFlP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticFloatField",
      "field_offset" : 9728,
-     "referenced_type" : "type-342"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticDoubleField",
      "field_offset" : 9792,
-     "referenced_type" : "type-344"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "SetStaticObjectField",
      "field_offset" : 9856,
-     "referenced_type" : "type-346"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE"
     },
     {
      "field_name" : "SetStaticBooleanField",
      "field_offset" : 9920,
-     "referenced_type" : "type-348"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDhE"
     },
     {
      "field_name" : "SetStaticByteField",
      "field_offset" : 9984,
-     "referenced_type" : "type-350"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDaE"
     },
     {
      "field_name" : "SetStaticCharField",
      "field_offset" : 10048,
-     "referenced_type" : "type-352"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDtE"
     },
     {
      "field_name" : "SetStaticShortField",
      "field_offset" : 10112,
-     "referenced_type" : "type-354"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDsE"
     },
     {
      "field_name" : "SetStaticIntField",
      "field_offset" : 10176,
-     "referenced_type" : "type-356"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDiE"
     },
     {
      "field_name" : "SetStaticLongField",
      "field_offset" : 10240,
-     "referenced_type" : "type-358"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDlE"
     },
     {
      "field_name" : "SetStaticFloatField",
      "field_offset" : 10304,
-     "referenced_type" : "type-360"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDfE"
     },
     {
      "field_name" : "SetStaticDoubleField",
      "field_offset" : 10368,
-     "referenced_type" : "type-362"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDdE"
     },
     {
      "field_name" : "NewString",
      "field_offset" : 10432,
-     "referenced_type" : "type-364"
+     "referenced_type" : "_ZTIPFP8_jstringP7_JNIEnvPKtiE"
     },
     {
      "field_name" : "GetStringLength",
      "field_offset" : 10496,
-     "referenced_type" : "type-370"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jstringE"
     },
     {
      "field_name" : "GetStringChars",
      "field_offset" : 10560,
-     "referenced_type" : "type-372"
+     "referenced_type" : "_ZTIPFPKtP7_JNIEnvP8_jstringPhE"
     },
     {
      "field_name" : "ReleaseStringChars",
      "field_offset" : 10624,
-     "referenced_type" : "type-375"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKtE"
     },
     {
      "field_name" : "NewStringUTF",
      "field_offset" : 10688,
-     "referenced_type" : "type-377"
+     "referenced_type" : "_ZTIPFP8_jstringP7_JNIEnvPKcE"
     },
     {
      "field_name" : "GetStringUTFLength",
      "field_offset" : 10752,
-     "referenced_type" : "type-370"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jstringE"
     },
     {
      "field_name" : "GetStringUTFChars",
      "field_offset" : 10816,
-     "referenced_type" : "type-379"
+     "referenced_type" : "_ZTIPFPKcP7_JNIEnvP8_jstringPhE"
     },
     {
      "field_name" : "ReleaseStringUTFChars",
      "field_offset" : 10880,
-     "referenced_type" : "type-381"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKcE"
     },
     {
      "field_name" : "GetArrayLength",
      "field_offset" : 10944,
-     "referenced_type" : "type-383"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jarrayE"
     },
     {
      "field_name" : "NewObjectArray",
      "field_offset" : 11008,
-     "referenced_type" : "type-387"
+     "referenced_type" : "_ZTIPFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE"
     },
     {
      "field_name" : "GetObjectArrayElement",
      "field_offset" : 11072,
-     "referenced_type" : "type-391"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP13_jobjectArrayiE"
     },
     {
      "field_name" : "SetObjectArrayElement",
      "field_offset" : 11136,
-     "referenced_type" : "type-393"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE"
     },
     {
      "field_name" : "NewBooleanArray",
      "field_offset" : 11200,
-     "referenced_type" : "type-395"
+     "referenced_type" : "_ZTIPFP14_jbooleanArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewByteArray",
      "field_offset" : 11264,
-     "referenced_type" : "type-399"
+     "referenced_type" : "_ZTIPFP11_jbyteArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewCharArray",
      "field_offset" : 11328,
-     "referenced_type" : "type-403"
+     "referenced_type" : "_ZTIPFP11_jcharArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewShortArray",
      "field_offset" : 11392,
-     "referenced_type" : "type-407"
+     "referenced_type" : "_ZTIPFP12_jshortArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewIntArray",
      "field_offset" : 11456,
-     "referenced_type" : "type-411"
+     "referenced_type" : "_ZTIPFP10_jintArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewLongArray",
      "field_offset" : 11520,
-     "referenced_type" : "type-415"
+     "referenced_type" : "_ZTIPFP11_jlongArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewFloatArray",
      "field_offset" : 11584,
-     "referenced_type" : "type-419"
+     "referenced_type" : "_ZTIPFP12_jfloatArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewDoubleArray",
      "field_offset" : 11648,
-     "referenced_type" : "type-423"
+     "referenced_type" : "_ZTIPFP13_jdoubleArrayP7_JNIEnviE"
     },
     {
      "field_name" : "GetBooleanArrayElements",
      "field_offset" : 11712,
-     "referenced_type" : "type-427"
+     "referenced_type" : "_ZTIPFPhP7_JNIEnvP14_jbooleanArrayS_E"
     },
     {
      "field_name" : "GetByteArrayElements",
      "field_offset" : 11776,
-     "referenced_type" : "type-429"
+     "referenced_type" : "_ZTIPFPaP7_JNIEnvP11_jbyteArrayPhE"
     },
     {
      "field_name" : "GetCharArrayElements",
      "field_offset" : 11840,
-     "referenced_type" : "type-432"
+     "referenced_type" : "_ZTIPFPtP7_JNIEnvP11_jcharArrayPhE"
     },
     {
      "field_name" : "GetShortArrayElements",
      "field_offset" : 11904,
-     "referenced_type" : "type-435"
+     "referenced_type" : "_ZTIPFPsP7_JNIEnvP12_jshortArrayPhE"
     },
     {
      "field_name" : "GetIntArrayElements",
      "field_offset" : 11968,
-     "referenced_type" : "type-438"
+     "referenced_type" : "_ZTIPFPiP7_JNIEnvP10_jintArrayPhE"
     },
     {
      "field_name" : "GetLongArrayElements",
      "field_offset" : 12032,
-     "referenced_type" : "type-441"
+     "referenced_type" : "_ZTIPFPlP7_JNIEnvP11_jlongArrayPhE"
     },
     {
      "field_name" : "GetFloatArrayElements",
      "field_offset" : 12096,
-     "referenced_type" : "type-444"
+     "referenced_type" : "_ZTIPFPfP7_JNIEnvP12_jfloatArrayPhE"
     },
     {
      "field_name" : "GetDoubleArrayElements",
      "field_offset" : 12160,
-     "referenced_type" : "type-447"
+     "referenced_type" : "_ZTIPFPdP7_JNIEnvP13_jdoubleArrayPhE"
     },
     {
      "field_name" : "ReleaseBooleanArrayElements",
      "field_offset" : 12224,
-     "referenced_type" : "type-450"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayPhiE"
     },
     {
      "field_name" : "ReleaseByteArrayElements",
      "field_offset" : 12288,
-     "referenced_type" : "type-452"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayPaiE"
     },
     {
      "field_name" : "ReleaseCharArrayElements",
      "field_offset" : 12352,
-     "referenced_type" : "type-454"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayPtiE"
     },
     {
      "field_name" : "ReleaseShortArrayElements",
      "field_offset" : 12416,
-     "referenced_type" : "type-456"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayPsiE"
     },
     {
      "field_name" : "ReleaseIntArrayElements",
      "field_offset" : 12480,
-     "referenced_type" : "type-458"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayPiiE"
     },
     {
      "field_name" : "ReleaseLongArrayElements",
      "field_offset" : 12544,
-     "referenced_type" : "type-460"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayPliE"
     },
     {
      "field_name" : "ReleaseFloatArrayElements",
      "field_offset" : 12608,
-     "referenced_type" : "type-462"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayPfiE"
     },
     {
      "field_name" : "ReleaseDoubleArrayElements",
      "field_offset" : 12672,
-     "referenced_type" : "type-464"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayPdiE"
     },
     {
      "field_name" : "GetBooleanArrayRegion",
      "field_offset" : 12736,
-     "referenced_type" : "type-466"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPhE"
     },
     {
      "field_name" : "GetByteArrayRegion",
      "field_offset" : 12800,
-     "referenced_type" : "type-468"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPaE"
     },
     {
      "field_name" : "GetCharArrayRegion",
      "field_offset" : 12864,
-     "referenced_type" : "type-470"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPtE"
     },
     {
      "field_name" : "GetShortArrayRegion",
      "field_offset" : 12928,
-     "referenced_type" : "type-472"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPsE"
     },
     {
      "field_name" : "GetIntArrayRegion",
      "field_offset" : 12992,
-     "referenced_type" : "type-474"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPiE"
     },
     {
      "field_name" : "GetLongArrayRegion",
      "field_offset" : 13056,
-     "referenced_type" : "type-476"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPlE"
     },
     {
      "field_name" : "GetFloatArrayRegion",
      "field_offset" : 13120,
-     "referenced_type" : "type-478"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPfE"
     },
     {
      "field_name" : "GetDoubleArrayRegion",
      "field_offset" : 13184,
-     "referenced_type" : "type-480"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPdE"
     },
     {
      "field_name" : "SetBooleanArrayRegion",
      "field_offset" : 13248,
-     "referenced_type" : "type-482"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPKhE"
     },
     {
      "field_name" : "SetByteArrayRegion",
      "field_offset" : 13312,
-     "referenced_type" : "type-486"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPKaE"
     },
     {
      "field_name" : "SetCharArrayRegion",
      "field_offset" : 13376,
-     "referenced_type" : "type-488"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPKtE"
     },
     {
      "field_name" : "SetShortArrayRegion",
      "field_offset" : 13440,
-     "referenced_type" : "type-490"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPKsE"
     },
     {
      "field_name" : "SetIntArrayRegion",
      "field_offset" : 13504,
-     "referenced_type" : "type-494"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPKiE"
     },
     {
      "field_name" : "SetLongArrayRegion",
      "field_offset" : 13568,
-     "referenced_type" : "type-498"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPKlE"
     },
     {
      "field_name" : "SetFloatArrayRegion",
      "field_offset" : 13632,
-     "referenced_type" : "type-502"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPKfE"
     },
     {
      "field_name" : "SetDoubleArrayRegion",
      "field_offset" : 13696,
-     "referenced_type" : "type-506"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPKdE"
     },
     {
      "field_name" : "RegisterNatives",
      "field_offset" : 13760,
-     "referenced_type" : "type-510"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE"
     },
     {
      "field_name" : "UnregisterNatives",
      "field_offset" : 13824,
-     "referenced_type" : "type-515"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassE"
     },
     {
      "field_name" : "MonitorEnter",
      "field_offset" : 13888,
-     "referenced_type" : "type-517"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "MonitorExit",
      "field_offset" : 13952,
-     "referenced_type" : "type-517"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "GetJavaVM",
      "field_offset" : 14016,
-     "referenced_type" : "type-519"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvPP7_JavaVME"
     },
     {
      "field_name" : "GetStringRegion",
      "field_offset" : 14080,
-     "referenced_type" : "type-535"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringiiPtE"
     },
     {
      "field_name" : "GetStringUTFRegion",
      "field_offset" : 14144,
-     "referenced_type" : "type-537"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringiiPcE"
     },
     {
      "field_name" : "GetPrimitiveArrayCritical",
      "field_offset" : 14208,
-     "referenced_type" : "type-540"
+     "referenced_type" : "_ZTIPFPvP7_JNIEnvP7_jarrayPhE"
     },
     {
      "field_name" : "ReleasePrimitiveArrayCritical",
      "field_offset" : 14272,
-     "referenced_type" : "type-542"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jarrayPviE"
     },
     {
      "field_name" : "GetStringCritical",
      "field_offset" : 14336,
-     "referenced_type" : "type-372"
+     "referenced_type" : "_ZTIPFPKtP7_JNIEnvP8_jstringPhE"
     },
     {
      "field_name" : "ReleaseStringCritical",
      "field_offset" : 14400,
-     "referenced_type" : "type-375"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKtE"
     },
     {
      "field_name" : "NewWeakGlobalRef",
      "field_offset" : 14464,
-     "referenced_type" : "type-60"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E"
     },
     {
      "field_name" : "DeleteWeakGlobalRef",
      "field_offset" : 14528,
-     "referenced_type" : "type-62"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "ExceptionCheck",
      "field_offset" : 14592,
-     "referenced_type" : "type-544"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvE"
     },
     {
      "field_name" : "NewDirectByteBuffer",
      "field_offset" : 14656,
-     "referenced_type" : "type-546"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvPvlE"
     },
     {
      "field_name" : "GetDirectBufferAddress",
      "field_offset" : 14720,
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIPFPvP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "GetDirectBufferCapacity",
      "field_offset" : 14784,
-     "referenced_type" : "type-550"
+     "referenced_type" : "_ZTIPFlP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "GetObjectRefType",
      "field_offset" : 14848,
-     "referenced_type" : "type-552"
+     "referenced_type" : "_ZTIPF14jobjectRefTypeP7_JNIEnvP8_jobjectE"
     }
    ],
    "linker_set_key" : "_ZTI18JNINativeInterface",
    "name" : "JNINativeInterface",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "_ZTI18JNINativeInterface",
+   "self_type" : "_ZTI18JNINativeInterface",
    "size" : 1864,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12193,46 +11906,46 @@
    [
     {
      "field_name" : "z",
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     },
     {
      "field_name" : "b",
-     "referenced_type" : "type-26"
+     "referenced_type" : "_ZTIa"
     },
     {
      "field_name" : "c",
-     "referenced_type" : "type-76"
+     "referenced_type" : "_ZTIt"
     },
     {
      "field_name" : "s",
-     "referenced_type" : "type-77"
+     "referenced_type" : "_ZTIs"
     },
     {
      "field_name" : "i",
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "j",
-     "referenced_type" : "type-78"
+     "referenced_type" : "_ZTIl"
     },
     {
      "field_name" : "f",
-     "referenced_type" : "type-79"
+     "referenced_type" : "_ZTIf"
     },
     {
      "field_name" : "d",
-     "referenced_type" : "type-80"
+     "referenced_type" : "_ZTId"
     },
     {
      "field_name" : "l",
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI6jvalue",
    "name" : "jvalue",
    "record_kind" : "union",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "_ZTI6jvalue",
+   "self_type" : "_ZTI6jvalue",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12242,13 +11955,13 @@
    [
     {
      "field_name" : "functions",
-     "referenced_type" : "type-9"
+     "referenced_type" : "_ZTIPK18JNINativeInterface"
     }
    ],
    "linker_set_key" : "_ZTI7_JNIEnv",
    "name" : "_JNIEnv",
-   "referenced_type" : "type-8",
-   "self_type" : "type-8",
+   "referenced_type" : "_ZTI7_JNIEnv",
+   "self_type" : "_ZTI7_JNIEnv",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12258,13 +11971,13 @@
    [
     {
      "field_name" : "functions",
-     "referenced_type" : "type-524"
+     "referenced_type" : "_ZTIPK18JNIInvokeInterface"
     }
    ],
    "linker_set_key" : "_ZTI7_JavaVM",
    "name" : "_JavaVM",
-   "referenced_type" : "type-523",
-   "self_type" : "type-523",
+   "referenced_type" : "_ZTI7_JavaVM",
+   "self_type" : "_ZTI7_JavaVM",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12273,14 +11986,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTI8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI7_jarray",
    "name" : "_jarray",
    "record_kind" : "class",
-   "referenced_type" : "type-386",
-   "self_type" : "type-386",
+   "referenced_type" : "_ZTI7_jarray",
+   "self_type" : "_ZTI7_jarray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12289,14 +12002,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTI8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI7_jclass",
    "name" : "_jclass",
    "record_kind" : "class",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "_ZTI7_jclass",
+   "self_type" : "_ZTI7_jclass",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12305,8 +12018,8 @@
    "linker_set_key" : "_ZTI8_jobject",
    "name" : "_jobject",
    "record_kind" : "class",
-   "referenced_type" : "type-6",
-   "self_type" : "type-6",
+   "referenced_type" : "_ZTI8_jobject",
+   "self_type" : "_ZTI8_jobject",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12315,14 +12028,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTI8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI8_jstring",
    "name" : "_jstring",
    "record_kind" : "class",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
+   "referenced_type" : "_ZTI8_jstring",
+   "self_type" : "_ZTI8_jstring",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   }
diff --git a/R/64/arm_armv7-a-neon/source-based/libbinder_ndk.so.lsdump b/R/64/arm_armv7-a-neon/source-based/libbinder_ndk.so.lsdump
index 52e4767..7a0af47 100644
--- a/R/64/arm_armv7-a-neon/source-based/libbinder_ndk.so.lsdump
+++ b/R/64/arm_armv7-a-neon/source-based/libbinder_ndk.so.lsdump
@@ -8,8 +8,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIDs",
    "name" : "char16_t",
-   "referenced_type" : "type-646",
-   "self_type" : "type-646",
+   "referenced_type" : "_ZTIDs",
+   "self_type" : "_ZTIDs",
    "size" : 2
   },
   {
@@ -17,8 +17,8 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIa",
    "name" : "signed char",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
+   "referenced_type" : "_ZTIa",
+   "self_type" : "_ZTIa",
    "size" : 1
   },
   {
@@ -27,8 +27,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIb",
    "name" : "bool",
-   "referenced_type" : "type-599",
-   "self_type" : "type-599",
+   "referenced_type" : "_ZTIb",
+   "self_type" : "_ZTIb",
    "size" : 1
   },
   {
@@ -37,32 +37,32 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIc",
    "name" : "char",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIc",
    "size" : 1
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTId",
    "name" : "double",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
+   "referenced_type" : "_ZTId",
+   "self_type" : "_ZTId",
    "size" : 8
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIe",
    "name" : "long double",
-   "referenced_type" : "type-582",
-   "self_type" : "type-582",
+   "referenced_type" : "_ZTIe",
+   "self_type" : "_ZTIe",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIf",
    "name" : "float",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
+   "referenced_type" : "_ZTIf",
+   "self_type" : "_ZTIf",
    "size" : 4
   },
   {
@@ -71,8 +71,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIh",
    "name" : "unsigned char",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIh",
    "size" : 1
   },
   {
@@ -80,8 +80,8 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIi",
    "name" : "int",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
+   "referenced_type" : "_ZTIi",
+   "self_type" : "_ZTIi",
    "size" : 4
   },
   {
@@ -90,8 +90,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIj",
    "name" : "unsigned int",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
+   "referenced_type" : "_ZTIj",
+   "self_type" : "_ZTIj",
    "size" : 4
   },
   {
@@ -99,8 +99,8 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIl",
    "name" : "long",
-   "referenced_type" : "type-583",
-   "self_type" : "type-583",
+   "referenced_type" : "_ZTIl",
+   "self_type" : "_ZTIl",
    "size" : 4
   },
   {
@@ -109,8 +109,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIm",
    "name" : "unsigned long",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
+   "referenced_type" : "_ZTIm",
+   "self_type" : "_ZTIm",
    "size" : 4
   },
   {
@@ -118,8 +118,8 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIs",
    "name" : "short",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "_ZTIs",
+   "self_type" : "_ZTIs",
    "size" : 2
   },
   {
@@ -128,23 +128,23 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIt",
    "name" : "unsigned short",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "_ZTIt",
+   "self_type" : "_ZTIt",
    "size" : 2
   },
   {
    "linker_set_key" : "_ZTIv",
    "name" : "void",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13"
+   "referenced_type" : "_ZTIv",
+   "self_type" : "_ZTIv"
   },
   {
    "alignment" : 8,
    "is_integral" : true,
    "linker_set_key" : "_ZTIx",
    "name" : "long long",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
+   "referenced_type" : "_ZTIx",
+   "self_type" : "_ZTIx",
    "size" : 8
   },
   {
@@ -153,8 +153,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIy",
    "name" : "unsigned long long",
-   "referenced_type" : "type-645",
-   "self_type" : "type-645",
+   "referenced_type" : "_ZTIy",
+   "self_type" : "_ZTIy",
    "size" : 8
   }
  ],
@@ -494,11 +494,11 @@
    ],
    "linker_set_key" : "_ZTI14jobjectRefType",
    "name" : "jobjectRefType",
-   "referenced_type" : "type-554",
-   "self_type" : "type-554",
+   "referenced_type" : "_ZTI14jobjectRefType",
+   "self_type" : "_ZTI14jobjectRefType",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h",
-   "underlying_type" : "type-555"
+   "underlying_type" : "_ZTIj"
   }
  ],
  "function_types" :
@@ -510,15 +510,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-553",
-   "return_type" : "type-554",
-   "self_type" : "type-553",
+   "referenced_type" : "_ZTIF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTI14jobjectRefType",
+   "self_type" : "_ZTIF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -528,15 +528,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-412",
-   "return_type" : "type-413",
-   "self_type" : "type-412",
+   "referenced_type" : "_ZTIFP10_jintArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP10_jintArray",
+   "self_type" : "_ZTIFP10_jintArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -546,21 +546,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-86",
-   "return_type" : "type-31",
-   "self_type" : "type-86",
+   "referenced_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
+   "return_type" : "_ZTIP10_jmethodID",
+   "self_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -570,15 +570,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-30",
-   "return_type" : "type-31",
-   "self_type" : "type-30",
+   "referenced_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIP10_jmethodID",
+   "self_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -588,15 +588,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-400",
-   "return_type" : "type-401",
-   "self_type" : "type-400",
+   "referenced_type" : "_ZTIFP11_jbyteArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP11_jbyteArray",
+   "self_type" : "_ZTIFP11_jbyteArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -606,15 +606,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-404",
-   "return_type" : "type-405",
-   "self_type" : "type-404",
+   "referenced_type" : "_ZTIFP11_jcharArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP11_jcharArray",
+   "self_type" : "_ZTIFP11_jcharArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -624,15 +624,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-416",
-   "return_type" : "type-417",
-   "self_type" : "type-416",
+   "referenced_type" : "_ZTIFP11_jlongArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP11_jlongArray",
+   "self_type" : "_ZTIFP11_jlongArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -642,12 +642,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     }
    ],
-   "referenced_type" : "type-53",
-   "return_type" : "type-48",
-   "self_type" : "type-53",
+   "referenced_type" : "_ZTIFP11_jthrowableP7_JNIEnvE",
+   "return_type" : "_ZTIP11_jthrowable",
+   "self_type" : "_ZTIFP11_jthrowableP7_JNIEnvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -657,15 +657,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-420",
-   "return_type" : "type-421",
-   "self_type" : "type-420",
+   "referenced_type" : "_ZTIFP12_jfloatArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP12_jfloatArray",
+   "self_type" : "_ZTIFP12_jfloatArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -675,15 +675,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-408",
-   "return_type" : "type-409",
-   "self_type" : "type-408",
+   "referenced_type" : "_ZTIFP12_jshortArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP12_jshortArray",
+   "self_type" : "_ZTIFP12_jshortArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -693,15 +693,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-424",
-   "return_type" : "type-425",
-   "self_type" : "type-424",
+   "referenced_type" : "_ZTIFP13_jdoubleArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP13_jdoubleArray",
+   "self_type" : "_ZTIFP13_jdoubleArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -711,21 +711,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-388",
-   "return_type" : "type-389",
-   "self_type" : "type-388",
+   "referenced_type" : "_ZTIFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
+   "return_type" : "_ZTIP13_jobjectArray",
+   "self_type" : "_ZTIFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -735,15 +735,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-396",
-   "return_type" : "type-397",
-   "self_type" : "type-396",
+   "referenced_type" : "_ZTIFP14_jbooleanArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP14_jbooleanArray",
+   "self_type" : "_ZTIFP14_jbooleanArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -753,15 +753,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-82",
-   "return_type" : "type-19",
-   "self_type" : "type-82",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIP7_jclass",
+   "self_type" : "_ZTIFP7_jclassP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -771,15 +771,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-28",
-   "return_type" : "type-19",
-   "self_type" : "type-28",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvPKcE",
+   "return_type" : "_ZTIP7_jclass",
+   "self_type" : "_ZTIFP7_jclassP7_JNIEnvPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -789,24 +789,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "_ZTIPKa"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-18",
-   "return_type" : "type-19",
-   "self_type" : "type-18",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
+   "return_type" : "_ZTIP7_jclass",
+   "self_type" : "_ZTIFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -816,15 +816,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-41",
-   "return_type" : "type-19",
-   "self_type" : "type-41",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvS0_E",
+   "return_type" : "_ZTIP7_jclass",
+   "self_type" : "_ZTIFP7_jclassP7_JNIEnvS0_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -834,18 +834,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-389"
+     "referenced_type" : "_ZTIP13_jobjectArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-392",
-   "return_type" : "type-5",
-   "self_type" : "type-392",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -855,15 +855,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-4",
-   "return_type" : "type-5",
-   "self_type" : "type-4",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -873,21 +873,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-72",
-   "return_type" : "type-5",
-   "self_type" : "type-72",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -897,21 +897,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-69",
-   "return_type" : "type-5",
-   "self_type" : "type-69",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -921,21 +921,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     }
    ],
-   "referenced_type" : "type-38",
-   "return_type" : "type-5",
-   "self_type" : "type-38",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -945,18 +945,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-67",
-   "return_type" : "type-5",
-   "self_type" : "type-67",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -966,18 +966,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-329",
-   "return_type" : "type-5",
-   "self_type" : "type-329",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -987,21 +987,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     }
    ],
-   "referenced_type" : "type-45",
-   "return_type" : "type-5",
-   "self_type" : "type-45",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1011,18 +1011,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "_ZTIx"
     }
    ],
-   "referenced_type" : "type-547",
-   "return_type" : "type-5",
-   "self_type" : "type-547",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvPvxE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvPvxE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1032,15 +1032,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-61",
-   "return_type" : "type-5",
-   "self_type" : "type-61",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_E",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1050,21 +1050,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-93",
-   "return_type" : "type-5",
-   "self_type" : "type-93",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1074,21 +1074,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-91"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-90",
-   "return_type" : "type-5",
-   "self_type" : "type-90",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1098,18 +1098,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-88",
-   "return_type" : "type-5",
-   "self_type" : "type-88",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1119,24 +1119,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-163",
-   "return_type" : "type-5",
-   "self_type" : "type-163",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1146,24 +1146,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-161"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-160",
-   "return_type" : "type-5",
-   "self_type" : "type-160",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1173,21 +1173,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-158",
-   "return_type" : "type-5",
-   "self_type" : "type-158",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1197,18 +1197,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-230",
-   "return_type" : "type-5",
-   "self_type" : "type-230",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1218,15 +1218,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-378",
-   "return_type" : "type-366",
-   "self_type" : "type-378",
+   "referenced_type" : "_ZTIFP8_jstringP7_JNIEnvPKcE",
+   "return_type" : "_ZTIP8_jstring",
+   "self_type" : "_ZTIFP8_jstringP7_JNIEnvPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1236,18 +1236,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "_ZTIPKt"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-365",
-   "return_type" : "type-366",
-   "self_type" : "type-365",
+   "referenced_type" : "_ZTIFP8_jstringP7_JNIEnvPKtiE",
+   "return_type" : "_ZTIP8_jstring",
+   "self_type" : "_ZTIFP8_jstringP7_JNIEnvPKtiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1257,21 +1257,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-228",
-   "return_type" : "type-35",
-   "self_type" : "type-228",
+   "referenced_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
+   "return_type" : "_ZTIP9_jfieldID",
+   "self_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1281,15 +1281,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-34",
-   "return_type" : "type-35",
-   "self_type" : "type-34",
+   "referenced_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIP9_jfieldID",
+   "self_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1299,18 +1299,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-366"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-380",
-   "return_type" : "type-21",
-   "self_type" : "type-380",
+   "referenced_type" : "_ZTIFPKcP7_JNIEnvP8_jstringPhE",
+   "return_type" : "_ZTIPKc",
+   "self_type" : "_ZTIFPKcP7_JNIEnvP8_jstringPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1320,18 +1320,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "_ZTIPi"
     }
    ],
-   "referenced_type" : "type-630",
-   "return_type" : "type-21",
-   "self_type" : "type-630",
+   "referenced_type" : "_ZTIFPKcPKvjPiE",
+   "return_type" : "_ZTIPKc",
+   "self_type" : "_ZTIFPKcPKvjPiE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1341,18 +1341,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-366"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-373",
-   "return_type" : "type-368",
-   "self_type" : "type-373",
+   "referenced_type" : "_ZTIFPKtP7_JNIEnvP8_jstringPhE",
+   "return_type" : "_ZTIPKt",
+   "self_type" : "_ZTIFPKtP7_JNIEnvP8_jstringPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1362,18 +1362,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-401"
+     "referenced_type" : "_ZTIP11_jbyteArray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-430",
-   "return_type" : "type-431",
-   "self_type" : "type-430",
+   "referenced_type" : "_ZTIFPaP7_JNIEnvP11_jbyteArrayPhE",
+   "return_type" : "_ZTIPa",
+   "self_type" : "_ZTIFPaP7_JNIEnvP11_jbyteArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1383,18 +1383,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-425"
+     "referenced_type" : "_ZTIP13_jdoubleArray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-448",
-   "return_type" : "type-449",
-   "self_type" : "type-448",
+   "referenced_type" : "_ZTIFPdP7_JNIEnvP13_jdoubleArrayPhE",
+   "return_type" : "_ZTIPd",
+   "self_type" : "_ZTIFPdP7_JNIEnvP13_jdoubleArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1404,18 +1404,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-421"
+     "referenced_type" : "_ZTIP12_jfloatArray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-445",
-   "return_type" : "type-446",
-   "self_type" : "type-445",
+   "referenced_type" : "_ZTIFPfP7_JNIEnvP12_jfloatArrayPhE",
+   "return_type" : "_ZTIPf",
+   "self_type" : "_ZTIFPfP7_JNIEnvP12_jfloatArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1425,18 +1425,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "_ZTIP14_jbooleanArray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-428",
-   "return_type" : "type-374",
-   "self_type" : "type-428",
+   "referenced_type" : "_ZTIFPhP7_JNIEnvP14_jbooleanArrayS_E",
+   "return_type" : "_ZTIPh",
+   "self_type" : "_ZTIFPhP7_JNIEnvP14_jbooleanArrayS_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1446,18 +1446,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "_ZTIP10_jintArray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-439",
-   "return_type" : "type-440",
-   "self_type" : "type-439",
+   "referenced_type" : "_ZTIFPiP7_JNIEnvP10_jintArrayPhE",
+   "return_type" : "_ZTIPi",
+   "self_type" : "_ZTIFPiP7_JNIEnvP10_jintArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1467,18 +1467,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-409"
+     "referenced_type" : "_ZTIP12_jshortArray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-436",
-   "return_type" : "type-437",
-   "self_type" : "type-436",
+   "referenced_type" : "_ZTIFPsP7_JNIEnvP12_jshortArrayPhE",
+   "return_type" : "_ZTIPs",
+   "self_type" : "_ZTIFPsP7_JNIEnvP12_jshortArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1488,18 +1488,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "_ZTIP11_jcharArray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-433",
-   "return_type" : "type-434",
-   "self_type" : "type-433",
+   "referenced_type" : "_ZTIFPtP7_JNIEnvP11_jcharArrayPhE",
+   "return_type" : "_ZTIPt",
+   "self_type" : "_ZTIFPtP7_JNIEnvP11_jcharArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1509,18 +1509,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "_ZTIP7_jarray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-541",
-   "return_type" : "type-12",
-   "self_type" : "type-541",
+   "referenced_type" : "_ZTIFPvP7_JNIEnvP7_jarrayPhE",
+   "return_type" : "_ZTIPv",
+   "self_type" : "_ZTIFPvP7_JNIEnvP7_jarrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1530,15 +1530,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-549",
-   "return_type" : "type-12",
-   "self_type" : "type-549",
+   "referenced_type" : "_ZTIFPvP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIPv",
+   "self_type" : "_ZTIFPvP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1548,12 +1548,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "referenced_type" : "type-610",
-   "return_type" : "type-12",
-   "self_type" : "type-610",
+   "referenced_type" : "_ZTIFPvS_E",
+   "return_type" : "_ZTIPv",
+   "self_type" : "_ZTIFPvS_E",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -1563,18 +1563,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-417"
+     "referenced_type" : "_ZTIP11_jlongArray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-442",
-   "return_type" : "type-443",
-   "self_type" : "type-442",
+   "referenced_type" : "_ZTIFPxP7_JNIEnvP11_jlongArrayPhE",
+   "return_type" : "_ZTIPx",
+   "self_type" : "_ZTIFPxP7_JNIEnvP11_jlongArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1584,21 +1584,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-278",
-   "return_type" : "type-26",
-   "self_type" : "type-278",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1608,21 +1608,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-276"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-275",
-   "return_type" : "type-26",
-   "self_type" : "type-275",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1632,18 +1632,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-273",
-   "return_type" : "type-26",
-   "self_type" : "type-273",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1653,18 +1653,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-333",
-   "return_type" : "type-26",
-   "self_type" : "type-333",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1674,21 +1674,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-107",
-   "return_type" : "type-26",
-   "self_type" : "type-107",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1698,21 +1698,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-104",
-   "return_type" : "type-26",
-   "self_type" : "type-104",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1722,18 +1722,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-102",
-   "return_type" : "type-26",
-   "self_type" : "type-102",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1743,24 +1743,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-177",
-   "return_type" : "type-26",
-   "self_type" : "type-177",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1770,24 +1770,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-175"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-174",
-   "return_type" : "type-26",
-   "self_type" : "type-174",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1797,21 +1797,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-172",
-   "return_type" : "type-26",
-   "self_type" : "type-172",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1821,18 +1821,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-234",
-   "return_type" : "type-26",
-   "self_type" : "type-234",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1842,15 +1842,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "referenced_type" : "type-655",
-   "return_type" : "type-599",
-   "self_type" : "type-655",
+   "referenced_type" : "_ZTIFbPKvjE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPKvjE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1860,15 +1860,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-634",
-   "return_type" : "type-599",
-   "self_type" : "type-634",
+   "referenced_type" : "_ZTIFbPviE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1878,18 +1878,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-683"
+     "referenced_type" : "_ZTIPPDs"
     }
    ],
-   "referenced_type" : "type-682",
-   "return_type" : "type-599",
-   "self_type" : "type-682",
+   "referenced_type" : "_ZTIFbPviPPDsE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPDsE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1899,18 +1899,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-686"
+     "referenced_type" : "_ZTIPPa"
     }
    ],
-   "referenced_type" : "type-685",
-   "return_type" : "type-599",
-   "self_type" : "type-685",
+   "referenced_type" : "_ZTIFbPviPPaE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPaE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1920,18 +1920,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-626"
+     "referenced_type" : "_ZTIPPc"
     }
    ],
-   "referenced_type" : "type-625",
-   "return_type" : "type-599",
-   "self_type" : "type-625",
+   "referenced_type" : "_ZTIFbPviPPcE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPcE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1941,18 +1941,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-677"
+     "referenced_type" : "_ZTIPPd"
     }
    ],
-   "referenced_type" : "type-676",
-   "return_type" : "type-599",
-   "self_type" : "type-676",
+   "referenced_type" : "_ZTIFbPviPPdE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPdE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1962,18 +1962,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-674"
+     "referenced_type" : "_ZTIPPf"
     }
    ],
-   "referenced_type" : "type-673",
-   "return_type" : "type-599",
-   "self_type" : "type-673",
+   "referenced_type" : "_ZTIFbPviPPfE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPfE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1983,18 +1983,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-660"
+     "referenced_type" : "_ZTIPPi"
     }
    ],
-   "referenced_type" : "type-659",
-   "return_type" : "type-599",
-   "self_type" : "type-659",
+   "referenced_type" : "_ZTIFbPviPPiE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPiE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -2004,18 +2004,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-663"
+     "referenced_type" : "_ZTIPPj"
     }
    ],
-   "referenced_type" : "type-662",
-   "return_type" : "type-599",
-   "self_type" : "type-662",
+   "referenced_type" : "_ZTIFbPviPPjE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPjE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -2025,18 +2025,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-666"
+     "referenced_type" : "_ZTIPPx"
     }
    ],
-   "referenced_type" : "type-665",
-   "return_type" : "type-599",
-   "self_type" : "type-665",
+   "referenced_type" : "_ZTIFbPviPPxE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPxE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -2046,18 +2046,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-669"
+     "referenced_type" : "_ZTIPPy"
     }
    ],
-   "referenced_type" : "type-668",
-   "return_type" : "type-599",
-   "self_type" : "type-668",
+   "referenced_type" : "_ZTIFbPviPPyE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPyE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -2067,21 +2067,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-626"
+     "referenced_type" : "_ZTIPPc"
     }
    ],
-   "referenced_type" : "type-636",
-   "return_type" : "type-599",
-   "self_type" : "type-636",
+   "referenced_type" : "_ZTIFbPvjiPPcE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPvjiPPcE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -2091,21 +2091,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-320",
-   "return_type" : "type-80",
-   "self_type" : "type-320",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2115,21 +2115,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-318"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-317",
-   "return_type" : "type-80",
-   "self_type" : "type-317",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2139,18 +2139,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-315",
-   "return_type" : "type-80",
-   "self_type" : "type-315",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2160,18 +2160,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-345",
-   "return_type" : "type-80",
-   "self_type" : "type-345",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2181,21 +2181,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-149",
-   "return_type" : "type-80",
-   "self_type" : "type-149",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2205,21 +2205,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-146",
-   "return_type" : "type-80",
-   "self_type" : "type-146",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2229,18 +2229,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-144",
-   "return_type" : "type-80",
-   "self_type" : "type-144",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2250,24 +2250,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-219",
-   "return_type" : "type-80",
-   "self_type" : "type-219",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2277,24 +2277,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-216",
-   "return_type" : "type-80",
-   "self_type" : "type-216",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2304,21 +2304,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-214",
-   "return_type" : "type-80",
-   "self_type" : "type-214",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2328,18 +2328,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-246",
-   "return_type" : "type-80",
-   "self_type" : "type-246",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2349,21 +2349,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-313",
-   "return_type" : "type-79",
-   "self_type" : "type-313",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2373,21 +2373,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-311"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-310",
-   "return_type" : "type-79",
-   "self_type" : "type-310",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2397,18 +2397,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-308",
-   "return_type" : "type-79",
-   "self_type" : "type-308",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2418,18 +2418,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-343",
-   "return_type" : "type-79",
-   "self_type" : "type-343",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2439,21 +2439,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-142",
-   "return_type" : "type-79",
-   "self_type" : "type-142",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2463,21 +2463,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-139",
-   "return_type" : "type-79",
-   "self_type" : "type-139",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2487,18 +2487,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-137",
-   "return_type" : "type-79",
-   "self_type" : "type-137",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2508,24 +2508,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-212",
-   "return_type" : "type-79",
-   "self_type" : "type-212",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2535,24 +2535,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-210"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-209",
-   "return_type" : "type-79",
-   "self_type" : "type-209",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2562,21 +2562,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-207",
-   "return_type" : "type-79",
-   "self_type" : "type-207",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2586,18 +2586,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-244",
-   "return_type" : "type-79",
-   "self_type" : "type-244",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2607,12 +2607,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     }
    ],
-   "referenced_type" : "type-545",
-   "return_type" : "type-39",
-   "self_type" : "type-545",
+   "referenced_type" : "_ZTIFhP7_JNIEnvE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2622,21 +2622,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-271",
-   "return_type" : "type-39",
-   "self_type" : "type-271",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2646,21 +2646,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-269"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-268",
-   "return_type" : "type-39",
-   "self_type" : "type-268",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2670,18 +2670,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-266",
-   "return_type" : "type-39",
-   "self_type" : "type-266",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2691,18 +2691,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-331",
-   "return_type" : "type-39",
-   "self_type" : "type-331",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2712,18 +2712,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-43",
-   "return_type" : "type-39",
-   "self_type" : "type-43",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassS2_E",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassS2_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2733,21 +2733,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-100",
-   "return_type" : "type-39",
-   "self_type" : "type-100",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2757,21 +2757,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-98"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-97",
-   "return_type" : "type-39",
-   "self_type" : "type-97",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2781,18 +2781,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-95",
-   "return_type" : "type-39",
-   "self_type" : "type-95",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2802,18 +2802,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-84",
-   "return_type" : "type-39",
-   "self_type" : "type-84",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2823,24 +2823,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-170",
-   "return_type" : "type-39",
-   "self_type" : "type-170",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2850,24 +2850,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-168"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-167",
-   "return_type" : "type-39",
-   "self_type" : "type-167",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2877,21 +2877,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-165",
-   "return_type" : "type-39",
-   "self_type" : "type-165",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2901,18 +2901,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-232",
-   "return_type" : "type-39",
-   "self_type" : "type-232",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2922,18 +2922,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-65",
-   "return_type" : "type-39",
-   "self_type" : "type-65",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectS2_E",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectS2_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2943,18 +2943,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "referenced_type" : "type-638",
-   "return_type" : "type-16",
-   "self_type" : "type-638",
+   "referenced_type" : "_ZTIFiP7AParcelPKvjE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7AParcelPKvjE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -2964,12 +2964,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     }
    ],
-   "referenced_type" : "type-15",
-   "return_type" : "type-16",
-   "self_type" : "type-15",
+   "referenced_type" : "_ZTIFiP7_JNIEnvE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2979,15 +2979,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "_ZTIP11_jthrowable"
     }
    ],
-   "referenced_type" : "type-47",
-   "return_type" : "type-16",
-   "self_type" : "type-47",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP11_jthrowableE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP11_jthrowableE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2997,15 +2997,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "_ZTIP7_jarray"
     }
    ],
-   "referenced_type" : "type-384",
-   "return_type" : "type-16",
-   "self_type" : "type-384",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jarrayE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jarrayE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3015,15 +3015,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-516",
-   "return_type" : "type-16",
-   "self_type" : "type-516",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3033,21 +3033,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-299",
-   "return_type" : "type-16",
-   "self_type" : "type-299",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3057,21 +3057,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-297"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-296",
-   "return_type" : "type-16",
-   "self_type" : "type-296",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3081,18 +3081,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-294",
-   "return_type" : "type-16",
-   "self_type" : "type-294",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3102,18 +3102,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-339",
-   "return_type" : "type-16",
-   "self_type" : "type-339",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3123,21 +3123,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-512"
+     "referenced_type" : "_ZTIPK15JNINativeMethod"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-511",
-   "return_type" : "type-16",
-   "self_type" : "type-511",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3147,18 +3147,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-51",
-   "return_type" : "type-16",
-   "self_type" : "type-51",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassPKcE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3168,15 +3168,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-518",
-   "return_type" : "type-16",
-   "self_type" : "type-518",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3186,21 +3186,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-128",
-   "return_type" : "type-16",
-   "self_type" : "type-128",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3210,21 +3210,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-126"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-125",
-   "return_type" : "type-16",
-   "self_type" : "type-125",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3234,18 +3234,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-123",
-   "return_type" : "type-16",
-   "self_type" : "type-123",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3255,24 +3255,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-198",
-   "return_type" : "type-16",
-   "self_type" : "type-198",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3282,24 +3282,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-196"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-195",
-   "return_type" : "type-16",
-   "self_type" : "type-195",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3309,21 +3309,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-193",
-   "return_type" : "type-16",
-   "self_type" : "type-193",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3333,18 +3333,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-240",
-   "return_type" : "type-16",
-   "self_type" : "type-240",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3354,15 +3354,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-366"
+     "referenced_type" : "_ZTIP8_jstring"
     }
    ],
-   "referenced_type" : "type-371",
-   "return_type" : "type-16",
-   "self_type" : "type-371",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jstringE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jstringE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3372,15 +3372,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-521"
+     "referenced_type" : "_ZTIPP7_JavaVM"
     }
    ],
-   "referenced_type" : "type-520",
-   "return_type" : "type-16",
-   "self_type" : "type-520",
+   "referenced_type" : "_ZTIFiP7_JNIEnvPP7_JavaVME",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvPP7_JavaVME",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3390,15 +3390,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-59",
-   "return_type" : "type-16",
-   "self_type" : "type-59",
+   "referenced_type" : "_ZTIFiP7_JNIEnviE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3408,12 +3408,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-522"
+     "referenced_type" : "_ZTIP7_JavaVM"
     }
    ],
-   "referenced_type" : "type-528",
-   "return_type" : "type-16",
-   "self_type" : "type-528",
+   "referenced_type" : "_ZTIFiP7_JavaVME",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JavaVME",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3423,18 +3423,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-522"
+     "referenced_type" : "_ZTIP7_JavaVM"
     },
     {
-     "referenced_type" : "type-531"
+     "referenced_type" : "_ZTIPP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "referenced_type" : "type-530",
-   "return_type" : "type-16",
-   "self_type" : "type-530",
+   "referenced_type" : "_ZTIFiP7_JavaVMPP7_JNIEnvPvE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JavaVMPP7_JNIEnvPvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3444,18 +3444,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-522"
+     "referenced_type" : "_ZTIP7_JavaVM"
     },
     {
-     "referenced_type" : "type-534"
+     "referenced_type" : "_ZTIPPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-533",
-   "return_type" : "type-16",
-   "self_type" : "type-533",
+   "referenced_type" : "_ZTIFiP7_JavaVMPPviE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JavaVMPPviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3465,21 +3465,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "_ZTIPPKc"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "referenced_type" : "type-593",
-   "return_type" : "type-16",
-   "self_type" : "type-593",
+   "referenced_type" : "_ZTIFiP8AIBinderiPPKcjE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP8AIBinderiPPKcjE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -3489,21 +3489,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
-     "referenced_type" : "type-587"
+     "referenced_type" : "_ZTIP7AParcel"
     }
    ],
-   "referenced_type" : "type-590",
-   "return_type" : "type-16",
-   "self_type" : "type-590",
+   "referenced_type" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -3513,18 +3513,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "referenced_type" : "type-640",
-   "return_type" : "type-16",
-   "self_type" : "type-640",
+   "referenced_type" : "_ZTIFiPK7AParcelPvjE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiPK7AParcelPvjE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -3534,21 +3534,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-292",
-   "return_type" : "type-77",
-   "self_type" : "type-292",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3558,21 +3558,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-290"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-289",
-   "return_type" : "type-77",
-   "self_type" : "type-289",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3582,18 +3582,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-287",
-   "return_type" : "type-77",
-   "self_type" : "type-287",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3603,18 +3603,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-337",
-   "return_type" : "type-77",
-   "self_type" : "type-337",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3624,21 +3624,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-121",
-   "return_type" : "type-77",
-   "self_type" : "type-121",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3648,21 +3648,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-118",
-   "return_type" : "type-77",
-   "self_type" : "type-118",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3672,18 +3672,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-116",
-   "return_type" : "type-77",
-   "self_type" : "type-116",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3693,24 +3693,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-191",
-   "return_type" : "type-77",
-   "self_type" : "type-191",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3720,24 +3720,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-189"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-188",
-   "return_type" : "type-77",
-   "self_type" : "type-188",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3747,21 +3747,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-186",
-   "return_type" : "type-77",
-   "self_type" : "type-186",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3771,18 +3771,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-238",
-   "return_type" : "type-77",
-   "self_type" : "type-238",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3792,21 +3792,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-285",
-   "return_type" : "type-76",
-   "self_type" : "type-285",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3816,21 +3816,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-283"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-282",
-   "return_type" : "type-76",
-   "self_type" : "type-282",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3840,18 +3840,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-280",
-   "return_type" : "type-76",
-   "self_type" : "type-280",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3861,18 +3861,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-335",
-   "return_type" : "type-76",
-   "self_type" : "type-335",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3882,21 +3882,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-114",
-   "return_type" : "type-76",
-   "self_type" : "type-114",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3906,21 +3906,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-112"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-111",
-   "return_type" : "type-76",
-   "self_type" : "type-111",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3930,18 +3930,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-109",
-   "return_type" : "type-76",
-   "self_type" : "type-109",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3951,24 +3951,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-184",
-   "return_type" : "type-76",
-   "self_type" : "type-184",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3978,24 +3978,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-182"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-181",
-   "return_type" : "type-76",
-   "self_type" : "type-181",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4005,21 +4005,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-179",
-   "return_type" : "type-76",
-   "self_type" : "type-179",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4029,18 +4029,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-236",
-   "return_type" : "type-76",
-   "self_type" : "type-236",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4050,12 +4050,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     }
    ],
-   "referenced_type" : "type-55",
-   "return_type" : "type-13",
-   "self_type" : "type-55",
+   "referenced_type" : "_ZTIFvP7_JNIEnvE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4065,21 +4065,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "_ZTIP10_jintArray"
     },
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "_ZTIPi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-459",
-   "return_type" : "type-13",
-   "self_type" : "type-459",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayPiiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP10_jintArrayPiiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4089,24 +4089,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "_ZTIP10_jintArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-496"
+     "referenced_type" : "_ZTIPKi"
     }
    ],
-   "referenced_type" : "type-495",
-   "return_type" : "type-13",
-   "self_type" : "type-495",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPKiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPKiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4116,24 +4116,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "_ZTIP10_jintArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "_ZTIPi"
     }
    ],
-   "referenced_type" : "type-475",
-   "return_type" : "type-13",
-   "self_type" : "type-475",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4143,21 +4143,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-401"
+     "referenced_type" : "_ZTIP11_jbyteArray"
     },
     {
-     "referenced_type" : "type-431"
+     "referenced_type" : "_ZTIPa"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-453",
-   "return_type" : "type-13",
-   "self_type" : "type-453",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayPaiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayPaiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4167,24 +4167,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-401"
+     "referenced_type" : "_ZTIP11_jbyteArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "_ZTIPKa"
     }
    ],
-   "referenced_type" : "type-487",
-   "return_type" : "type-13",
-   "self_type" : "type-487",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPKaE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPKaE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4194,24 +4194,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-401"
+     "referenced_type" : "_ZTIP11_jbyteArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-431"
+     "referenced_type" : "_ZTIPa"
     }
    ],
-   "referenced_type" : "type-469",
-   "return_type" : "type-13",
-   "self_type" : "type-469",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPaE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPaE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4221,21 +4221,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "_ZTIP11_jcharArray"
     },
     {
-     "referenced_type" : "type-434"
+     "referenced_type" : "_ZTIPt"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-455",
-   "return_type" : "type-13",
-   "self_type" : "type-455",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayPtiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayPtiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4245,24 +4245,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "_ZTIP11_jcharArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "_ZTIPKt"
     }
    ],
-   "referenced_type" : "type-489",
-   "return_type" : "type-13",
-   "self_type" : "type-489",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPKtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPKtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4272,24 +4272,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "_ZTIP11_jcharArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-434"
+     "referenced_type" : "_ZTIPt"
     }
    ],
-   "referenced_type" : "type-471",
-   "return_type" : "type-13",
-   "self_type" : "type-471",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4299,21 +4299,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-417"
+     "referenced_type" : "_ZTIP11_jlongArray"
     },
     {
-     "referenced_type" : "type-443"
+     "referenced_type" : "_ZTIPx"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-461",
-   "return_type" : "type-13",
-   "self_type" : "type-461",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayPxiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayPxiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4323,24 +4323,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-417"
+     "referenced_type" : "_ZTIP11_jlongArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-500"
+     "referenced_type" : "_ZTIPKx"
     }
    ],
-   "referenced_type" : "type-499",
-   "return_type" : "type-13",
-   "self_type" : "type-499",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPKxE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPKxE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4350,24 +4350,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-417"
+     "referenced_type" : "_ZTIP11_jlongArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-443"
+     "referenced_type" : "_ZTIPx"
     }
    ],
-   "referenced_type" : "type-477",
-   "return_type" : "type-13",
-   "self_type" : "type-477",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPxE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPxE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4377,21 +4377,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-421"
+     "referenced_type" : "_ZTIP12_jfloatArray"
     },
     {
-     "referenced_type" : "type-446"
+     "referenced_type" : "_ZTIPf"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-463",
-   "return_type" : "type-13",
-   "self_type" : "type-463",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayPfiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayPfiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4401,24 +4401,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-421"
+     "referenced_type" : "_ZTIP12_jfloatArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-504"
+     "referenced_type" : "_ZTIPKf"
     }
    ],
-   "referenced_type" : "type-503",
-   "return_type" : "type-13",
-   "self_type" : "type-503",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPKfE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPKfE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4428,24 +4428,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-421"
+     "referenced_type" : "_ZTIP12_jfloatArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-446"
+     "referenced_type" : "_ZTIPf"
     }
    ],
-   "referenced_type" : "type-479",
-   "return_type" : "type-13",
-   "self_type" : "type-479",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPfE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPfE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4455,21 +4455,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-409"
+     "referenced_type" : "_ZTIP12_jshortArray"
     },
     {
-     "referenced_type" : "type-437"
+     "referenced_type" : "_ZTIPs"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-457",
-   "return_type" : "type-13",
-   "self_type" : "type-457",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayPsiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayPsiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4479,24 +4479,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-409"
+     "referenced_type" : "_ZTIP12_jshortArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-492"
+     "referenced_type" : "_ZTIPKs"
     }
    ],
-   "referenced_type" : "type-491",
-   "return_type" : "type-13",
-   "self_type" : "type-491",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPKsE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPKsE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4506,24 +4506,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-409"
+     "referenced_type" : "_ZTIP12_jshortArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-437"
+     "referenced_type" : "_ZTIPs"
     }
    ],
-   "referenced_type" : "type-473",
-   "return_type" : "type-13",
-   "self_type" : "type-473",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPsE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPsE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4533,21 +4533,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-425"
+     "referenced_type" : "_ZTIP13_jdoubleArray"
     },
     {
-     "referenced_type" : "type-449"
+     "referenced_type" : "_ZTIPd"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-465",
-   "return_type" : "type-13",
-   "self_type" : "type-465",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayPdiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayPdiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4557,24 +4557,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-425"
+     "referenced_type" : "_ZTIP13_jdoubleArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-508"
+     "referenced_type" : "_ZTIPKd"
     }
    ],
-   "referenced_type" : "type-507",
-   "return_type" : "type-13",
-   "self_type" : "type-507",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4584,24 +4584,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-425"
+     "referenced_type" : "_ZTIP13_jdoubleArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-449"
+     "referenced_type" : "_ZTIPd"
     }
    ],
-   "referenced_type" : "type-481",
-   "return_type" : "type-13",
-   "self_type" : "type-481",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPdE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPdE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4611,21 +4611,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-389"
+     "referenced_type" : "_ZTIP13_jobjectArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-394",
-   "return_type" : "type-13",
-   "self_type" : "type-394",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4635,21 +4635,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "_ZTIP14_jbooleanArray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-451",
-   "return_type" : "type-13",
-   "self_type" : "type-451",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayPhiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayPhiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4659,24 +4659,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "_ZTIP14_jbooleanArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "_ZTIPKh"
     }
    ],
-   "referenced_type" : "type-483",
-   "return_type" : "type-13",
-   "self_type" : "type-483",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4686,24 +4686,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "_ZTIP14_jbooleanArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-467",
-   "return_type" : "type-13",
-   "self_type" : "type-467",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPhE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4713,21 +4713,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "_ZTIP7_jarray"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-543",
-   "return_type" : "type-13",
-   "self_type" : "type-543",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jarrayPviE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jarrayPviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4737,21 +4737,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-327",
-   "return_type" : "type-13",
-   "self_type" : "type-327",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4761,21 +4761,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-325"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-324",
-   "return_type" : "type-13",
-   "self_type" : "type-324",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4785,18 +4785,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-322",
-   "return_type" : "type-13",
-   "self_type" : "type-322",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4806,21 +4806,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-347",
-   "return_type" : "type-13",
-   "self_type" : "type-347",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4830,21 +4830,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-26"
+     "referenced_type" : "_ZTIa"
     }
    ],
-   "referenced_type" : "type-351",
-   "return_type" : "type-13",
-   "self_type" : "type-351",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4854,21 +4854,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "_ZTId"
     }
    ],
-   "referenced_type" : "type-363",
-   "return_type" : "type-13",
-   "self_type" : "type-363",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4878,21 +4878,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-79"
+     "referenced_type" : "_ZTIf"
     }
    ],
-   "referenced_type" : "type-361",
-   "return_type" : "type-13",
-   "self_type" : "type-361",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4902,21 +4902,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     }
    ],
-   "referenced_type" : "type-349",
-   "return_type" : "type-13",
-   "self_type" : "type-349",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4926,21 +4926,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-357",
-   "return_type" : "type-13",
-   "self_type" : "type-357",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4950,21 +4950,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-77"
+     "referenced_type" : "_ZTIs"
     }
    ],
-   "referenced_type" : "type-355",
-   "return_type" : "type-13",
-   "self_type" : "type-355",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4974,21 +4974,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "_ZTIt"
     }
    ],
-   "referenced_type" : "type-353",
-   "return_type" : "type-13",
-   "self_type" : "type-353",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4998,21 +4998,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "_ZTIx"
     }
    ],
-   "referenced_type" : "type-359",
-   "return_type" : "type-13",
-   "self_type" : "type-359",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDxE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDxE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5022,15 +5022,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-63",
-   "return_type" : "type-13",
-   "self_type" : "type-63",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5040,21 +5040,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-156",
-   "return_type" : "type-13",
-   "self_type" : "type-156",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5064,21 +5064,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-153",
-   "return_type" : "type-13",
-   "self_type" : "type-153",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5088,18 +5088,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-151",
-   "return_type" : "type-13",
-   "self_type" : "type-151",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5109,24 +5109,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-226",
-   "return_type" : "type-13",
-   "self_type" : "type-226",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5136,24 +5136,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-224"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-223",
-   "return_type" : "type-13",
-   "self_type" : "type-223",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5163,21 +5163,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-221",
-   "return_type" : "type-13",
-   "self_type" : "type-221",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5187,21 +5187,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-248",
-   "return_type" : "type-13",
-   "self_type" : "type-248",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5211,21 +5211,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-26"
+     "referenced_type" : "_ZTIa"
     }
    ],
-   "referenced_type" : "type-252",
-   "return_type" : "type-13",
-   "self_type" : "type-252",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5235,21 +5235,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "_ZTId"
     }
    ],
-   "referenced_type" : "type-264",
-   "return_type" : "type-13",
-   "self_type" : "type-264",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5259,21 +5259,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-79"
+     "referenced_type" : "_ZTIf"
     }
    ],
-   "referenced_type" : "type-262",
-   "return_type" : "type-13",
-   "self_type" : "type-262",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5283,21 +5283,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     }
    ],
-   "referenced_type" : "type-250",
-   "return_type" : "type-13",
-   "self_type" : "type-250",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5307,21 +5307,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-258",
-   "return_type" : "type-13",
-   "self_type" : "type-258",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5331,21 +5331,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-77"
+     "referenced_type" : "_ZTIs"
     }
    ],
-   "referenced_type" : "type-256",
-   "return_type" : "type-13",
-   "self_type" : "type-256",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5355,21 +5355,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "_ZTIt"
     }
    ],
-   "referenced_type" : "type-254",
-   "return_type" : "type-13",
-   "self_type" : "type-254",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5379,21 +5379,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "_ZTIx"
     }
    ],
-   "referenced_type" : "type-260",
-   "return_type" : "type-13",
-   "self_type" : "type-260",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDxE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDxE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5403,18 +5403,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-366"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-382",
-   "return_type" : "type-13",
-   "self_type" : "type-382",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringPKcE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jstringPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5424,18 +5424,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-366"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "_ZTIPKt"
     }
    ],
-   "referenced_type" : "type-376",
-   "return_type" : "type-13",
-   "self_type" : "type-376",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringPKtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jstringPKtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5445,24 +5445,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-366"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-539"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-538",
-   "return_type" : "type-13",
-   "self_type" : "type-538",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPcE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5472,24 +5472,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-366"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-434"
+     "referenced_type" : "_ZTIPt"
     }
    ],
-   "referenced_type" : "type-536",
-   "return_type" : "type-13",
-   "self_type" : "type-536",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5499,15 +5499,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-57",
-   "return_type" : "type-13",
-   "self_type" : "type-57",
+   "referenced_type" : "_ZTIFvP7_JNIEnvPKcE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5517,12 +5517,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "referenced_type" : "type-602",
-   "return_type" : "type-13",
-   "self_type" : "type-602",
+   "referenced_type" : "_ZTIFvPvE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvPvE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5532,18 +5532,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-599"
+     "referenced_type" : "_ZTIb"
     }
    ],
-   "referenced_type" : "type-679",
-   "return_type" : "type-13",
-   "self_type" : "type-679",
+   "referenced_type" : "_ZTIFvPvjbE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvPvjbE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -5553,21 +5553,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-306",
-   "return_type" : "type-78",
-   "self_type" : "type-306",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5577,21 +5577,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-304"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-303",
-   "return_type" : "type-78",
-   "self_type" : "type-303",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5601,18 +5601,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-301",
-   "return_type" : "type-78",
-   "self_type" : "type-301",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5622,18 +5622,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-341",
-   "return_type" : "type-78",
-   "self_type" : "type-341",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5643,15 +5643,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-551",
-   "return_type" : "type-78",
-   "self_type" : "type-551",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5661,21 +5661,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-135",
-   "return_type" : "type-78",
-   "self_type" : "type-135",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5685,21 +5685,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-133"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-132",
-   "return_type" : "type-78",
-   "self_type" : "type-132",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5709,18 +5709,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-130",
-   "return_type" : "type-78",
-   "self_type" : "type-130",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5730,24 +5730,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-205",
-   "return_type" : "type-78",
-   "self_type" : "type-205",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5757,24 +5757,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-203"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-202",
-   "return_type" : "type-78",
-   "self_type" : "type-202",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5784,21 +5784,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-200",
-   "return_type" : "type-78",
-   "self_type" : "type-200",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5808,18 +5808,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-242",
-   "return_type" : "type-78",
-   "self_type" : "type-242",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   }
  ],
@@ -5828,7 +5828,7 @@
   {
    "function_name" : "ABinderProcess_joinThreadPool",
    "linker_set_key" : "ABinderProcess_joinThreadPool",
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_process.h"
   },
   {
@@ -5837,16 +5837,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "type-599",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_process.h"
   },
   {
    "function_name" : "ABinderProcess_startThreadPool",
    "linker_set_key" : "ABinderProcess_startThreadPool",
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_process.h"
   },
   {
@@ -5855,19 +5855,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-611"
+     "referenced_type" : "_ZTIPFPvS_E"
     },
     {
-     "referenced_type" : "type-618"
+     "referenced_type" : "_ZTIPFvPvE"
     },
     {
-     "referenced_type" : "type-589"
+     "referenced_type" : "_ZTIPFiP8AIBinderjPK7AParcelPS1_E"
     }
    ],
-   "return_type" : "type-1",
+   "return_type" : "_ZTIP14AIBinder_Class",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5876,13 +5876,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1"
+     "referenced_type" : "_ZTIP14AIBinder_Class"
     },
     {
-     "referenced_type" : "type-595"
+     "referenced_type" : "_ZTIPFiP8AIBinderiPPKcjE"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5891,10 +5891,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-604"
+     "referenced_type" : "_ZTIP23AIBinder_DeathRecipient"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5903,10 +5903,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-618"
+     "referenced_type" : "_ZTIPFvPvE"
     }
    ],
-   "return_type" : "type-604",
+   "return_type" : "_ZTIP23AIBinder_DeathRecipient",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5915,10 +5915,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-607"
+     "referenced_type" : "_ZTIP13AIBinder_Weak"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5927,10 +5927,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-607",
+   "return_type" : "_ZTIP13AIBinder_Weak",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5939,10 +5939,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-607"
+     "referenced_type" : "_ZTIP13AIBinder_Weak"
     }
    ],
-   "return_type" : "type-591",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5951,13 +5951,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-598"
+     "referenced_type" : "_ZTIPK14AIBinder_Class"
     }
    ],
-   "return_type" : "type-599",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5966,10 +5966,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5978,10 +5978,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5990,19 +5990,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "_ZTIPPKc"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6011,25 +6011,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "type-616",
+   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder_jni.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
   },
   {
    "function_name" : "AIBinder_getCallingPid",
    "linker_set_key" : "AIBinder_getCallingPid",
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
    "function_name" : "AIBinder_getCallingUid",
    "linker_set_key" : "AIBinder_getCallingUid",
-   "return_type" : "type-555",
+   "return_type" : "_ZTIj",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6038,10 +6038,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-598",
+   "return_type" : "_ZTIPK14AIBinder_Class",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6050,13 +6050,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-609"
+     "referenced_type" : "_ZTIPP8AIBinder"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6065,10 +6065,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "_ZTIPv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6077,10 +6077,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6089,10 +6089,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-603"
+     "referenced_type" : "_ZTIPK8AIBinder"
     }
    ],
-   "return_type" : "type-599",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6101,10 +6101,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-603"
+     "referenced_type" : "_ZTIPK8AIBinder"
     }
    ],
-   "return_type" : "type-599",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6113,16 +6113,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-604"
+     "referenced_type" : "_ZTIP23AIBinder_DeathRecipient"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6131,10 +6131,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-688"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/stability.sdump"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h"
   },
   {
@@ -6143,10 +6143,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-688"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/stability.sdump"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h"
   },
   {
@@ -6155,13 +6155,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-598"
+     "referenced_type" : "_ZTIPK14AIBinder_Class"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "return_type" : "type-591",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6170,10 +6170,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6182,13 +6182,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "_ZTIPP7AParcel"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6197,13 +6197,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6212,13 +6212,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-616"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder_jni.sdump"
     }
    ],
-   "return_type" : "type-5",
+   "return_type" : "_ZTIP8_jobject",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
   },
   {
@@ -6227,22 +6227,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "_ZTIPP7AParcel"
     },
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "_ZTIPP7AParcel"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6251,16 +6251,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-604"
+     "referenced_type" : "_ZTIP23AIBinder_DeathRecipient"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6269,10 +6269,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6281,10 +6281,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6293,13 +6293,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-649"
+     "referenced_type" : "_ZTIPb"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6308,19 +6308,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-635"
+     "referenced_type" : "_ZTIPFbPviE"
     },
     {
-     "referenced_type" : "type-680"
+     "referenced_type" : "_ZTIPFvPvjbE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6329,13 +6329,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-431"
+     "referenced_type" : "_ZTIPa"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6344,16 +6344,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-687"
+     "referenced_type" : "_ZTIPFbPviPPaE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6362,13 +6362,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-650"
+     "referenced_type" : "_ZTIPDs"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6377,16 +6377,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-684"
+     "referenced_type" : "_ZTIPFbPviPPDsE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6395,13 +6395,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-449"
+     "referenced_type" : "_ZTIPd"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6410,16 +6410,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-678"
+     "referenced_type" : "_ZTIPFbPviPPdE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6428,13 +6428,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-446"
+     "referenced_type" : "_ZTIPf"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6443,16 +6443,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-675"
+     "referenced_type" : "_ZTIPFbPviPPfE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6461,13 +6461,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "_ZTIPi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6476,16 +6476,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-661"
+     "referenced_type" : "_ZTIPFbPviPPiE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6494,13 +6494,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-443"
+     "referenced_type" : "_ZTIPx"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6509,16 +6509,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-667"
+     "referenced_type" : "_ZTIPFbPviPPxE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6527,13 +6527,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "_ZTIPi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6542,19 +6542,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-635"
+     "referenced_type" : "_ZTIPFbPviE"
     },
     {
-     "referenced_type" : "type-644"
+     "referenced_type" : "_ZTIPFiPK7AParcelPvjE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6563,13 +6563,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-624"
+     "referenced_type" : "_ZTIPP7AStatus"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6578,16 +6578,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-627"
+     "referenced_type" : "_ZTIPFbPviPPcE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6596,19 +6596,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-635"
+     "referenced_type" : "_ZTIPFbPviE"
     },
     {
-     "referenced_type" : "type-637"
+     "referenced_type" : "_ZTIPFbPvjiPPcE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6617,13 +6617,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-681"
+     "referenced_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6632,13 +6632,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-647"
+     "referenced_type" : "_ZTIPj"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6647,16 +6647,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-664"
+     "referenced_type" : "_ZTIPFbPviPPjE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6665,13 +6665,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-648"
+     "referenced_type" : "_ZTIPy"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6680,16 +6680,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-672"
+     "referenced_type" : "_ZTIPFbPviPPyE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6698,13 +6698,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6713,13 +6713,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-599"
+     "referenced_type" : "_ZTIb"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6728,19 +6728,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-656"
+     "referenced_type" : "_ZTIPFbPKvjE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6749,13 +6749,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-26"
+     "referenced_type" : "_ZTIa"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6764,16 +6764,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "_ZTIPKa"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6782,13 +6782,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-646"
+     "referenced_type" : "_ZTIDs"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6797,16 +6797,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-658"
+     "referenced_type" : "_ZTIPKDs"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6815,13 +6815,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "_ZTId"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6830,16 +6830,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-508"
+     "referenced_type" : "_ZTIPKd"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6848,13 +6848,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-79"
+     "referenced_type" : "_ZTIf"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6863,16 +6863,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-504"
+     "referenced_type" : "_ZTIPKf"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6881,13 +6881,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6896,16 +6896,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-496"
+     "referenced_type" : "_ZTIPKi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6914,13 +6914,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "_ZTIx"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6929,16 +6929,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-500"
+     "referenced_type" : "_ZTIPKx"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6947,13 +6947,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6962,19 +6962,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPFiP7AParcelPKvjE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6983,13 +6983,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-621"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6998,16 +6998,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7016,19 +7016,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-631"
+     "referenced_type" : "_ZTIPFPKcPKvjPiE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7037,13 +7037,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-670"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7052,13 +7052,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7067,16 +7067,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-652"
+     "referenced_type" : "_ZTIPKj"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7085,13 +7085,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-645"
+     "referenced_type" : "_ZTIy"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7100,16 +7100,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-654"
+     "referenced_type" : "_ZTIPKy"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7118,13 +7118,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-695"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7133,10 +7133,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-695",
+   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7145,10 +7145,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-695",
+   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7157,10 +7157,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-690"
+     "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7169,10 +7169,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7181,10 +7181,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-690",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7193,13 +7193,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-690",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7208,10 +7208,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-690",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7220,13 +7220,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-690",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7235,10 +7235,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-690",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7247,10 +7247,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-694"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-21",
+   "return_type" : "_ZTIPKc",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7259,10 +7259,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-694"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7271,10 +7271,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-694"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-21",
+   "return_type" : "_ZTIPKc",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7283,10 +7283,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-694"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7295,10 +7295,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-694"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7307,16 +7307,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-694"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-599",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
    "function_name" : "AStatus_newOk",
    "linker_set_key" : "AStatus_newOk",
-   "return_type" : "type-690",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   }
  ],
@@ -7328,8 +7328,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP10_jintArray",
    "name" : "_jintArray *",
-   "referenced_type" : "type-414",
-   "self_type" : "type-413",
+   "referenced_type" : "_ZTI10_jintArray",
+   "self_type" : "_ZTIP10_jintArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7337,17 +7337,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP10_jmethodID",
    "name" : "_jmethodID *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-31",
-   "size" : 4,
-   "source_file" : "/libnativehelper/include_jni/jni.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP10_jmethodID",
-   "name" : "_jmethodID *",
-   "referenced_type" : "type-719",
-   "self_type" : "type-718",
+   "referenced_type" : "_ZTI10_jmethodID",
+   "self_type" : "_ZTIP10_jmethodID",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7355,8 +7346,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP11_jbyteArray",
    "name" : "_jbyteArray *",
-   "referenced_type" : "type-402",
-   "self_type" : "type-401",
+   "referenced_type" : "_ZTI11_jbyteArray",
+   "self_type" : "_ZTIP11_jbyteArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7364,8 +7355,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP11_jcharArray",
    "name" : "_jcharArray *",
-   "referenced_type" : "type-406",
-   "self_type" : "type-405",
+   "referenced_type" : "_ZTI11_jcharArray",
+   "self_type" : "_ZTIP11_jcharArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7373,8 +7364,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP11_jlongArray",
    "name" : "_jlongArray *",
-   "referenced_type" : "type-418",
-   "self_type" : "type-417",
+   "referenced_type" : "_ZTI11_jlongArray",
+   "self_type" : "_ZTIP11_jlongArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7382,8 +7373,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP11_jthrowable",
    "name" : "_jthrowable *",
-   "referenced_type" : "type-49",
-   "self_type" : "type-48",
+   "referenced_type" : "_ZTI11_jthrowable",
+   "self_type" : "_ZTIP11_jthrowable",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7391,8 +7382,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP12JavaVMOption",
    "name" : "JavaVMOption *",
-   "referenced_type" : "type-613",
-   "self_type" : "type-615",
+   "referenced_type" : "_ZTI12JavaVMOption",
+   "self_type" : "_ZTIP12JavaVMOption",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7400,8 +7391,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP12_jfloatArray",
    "name" : "_jfloatArray *",
-   "referenced_type" : "type-422",
-   "self_type" : "type-421",
+   "referenced_type" : "_ZTI12_jfloatArray",
+   "self_type" : "_ZTIP12_jfloatArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7409,8 +7400,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP12_jshortArray",
    "name" : "_jshortArray *",
-   "referenced_type" : "type-410",
-   "self_type" : "type-409",
+   "referenced_type" : "_ZTI12_jshortArray",
+   "self_type" : "_ZTIP12_jshortArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7418,17 +7409,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP13AIBinder_Weak",
    "name" : "AIBinder_Weak *",
-   "referenced_type" : "type-608",
-   "self_type" : "type-607",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP13AIBinder_Weak",
-   "name" : "AIBinder_Weak *",
-   "referenced_type" : "type-716",
-   "self_type" : "type-715",
+   "referenced_type" : "_ZTI13AIBinder_Weak",
+   "self_type" : "_ZTIP13AIBinder_Weak",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -7436,8 +7418,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP13_jdoubleArray",
    "name" : "_jdoubleArray *",
-   "referenced_type" : "type-426",
-   "self_type" : "type-425",
+   "referenced_type" : "_ZTI13_jdoubleArray",
+   "self_type" : "_ZTIP13_jdoubleArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7445,8 +7427,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP13_jobjectArray",
    "name" : "_jobjectArray *",
-   "referenced_type" : "type-390",
-   "self_type" : "type-389",
+   "referenced_type" : "_ZTI13_jobjectArray",
+   "self_type" : "_ZTIP13_jobjectArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7454,17 +7436,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP14AIBinder_Class",
    "name" : "AIBinder_Class *",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP14AIBinder_Class",
-   "name" : "AIBinder_Class *",
-   "referenced_type" : "type-698",
-   "self_type" : "type-697",
+   "referenced_type" : "_ZTI14AIBinder_Class",
+   "self_type" : "_ZTIP14AIBinder_Class",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -7472,8 +7445,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP14_jbooleanArray",
    "name" : "_jbooleanArray *",
-   "referenced_type" : "type-398",
-   "self_type" : "type-397",
+   "referenced_type" : "_ZTI14_jbooleanArray",
+   "self_type" : "_ZTIP14_jbooleanArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7481,35 +7454,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP23AIBinder_DeathRecipient",
    "name" : "AIBinder_DeathRecipient *",
-   "referenced_type" : "type-605",
-   "self_type" : "type-604",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP23AIBinder_DeathRecipient",
-   "name" : "AIBinder_DeathRecipient *",
-   "referenced_type" : "type-713",
-   "self_type" : "type-712",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP7AParcel",
-   "name" : "AParcel *",
-   "referenced_type" : "type-565",
-   "self_type" : "type-564",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP7AParcel",
-   "name" : "AParcel *",
-   "referenced_type" : "type-588",
-   "self_type" : "type-587",
+   "referenced_type" : "_ZTI23AIBinder_DeathRecipient",
+   "self_type" : "_ZTIP23AIBinder_DeathRecipient",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -7517,17 +7463,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP7AParcel",
    "name" : "AParcel *",
-   "referenced_type" : "type-633",
-   "self_type" : "type-632",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP7AParcel",
-   "name" : "AParcel *",
-   "referenced_type" : "type-705",
-   "self_type" : "type-704",
+   "referenced_type" : "_ZTI7AParcel",
+   "self_type" : "_ZTIP7AParcel",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -7535,44 +7472,17 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP7AStatus",
    "name" : "AStatus *",
-   "referenced_type" : "type-562",
-   "self_type" : "type-561",
+   "referenced_type" : "_ZTI7AStatus",
+   "self_type" : "_ZTIP7AStatus",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP7AStatus",
-   "name" : "AStatus *",
-   "referenced_type" : "type-575",
-   "self_type" : "type-574",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP7AStatus",
-   "name" : "AStatus *",
-   "referenced_type" : "type-623",
-   "self_type" : "type-622",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP7AStatus",
-   "name" : "AStatus *",
-   "referenced_type" : "type-691",
-   "self_type" : "type-690",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP7_JNIEnv",
    "name" : "_JNIEnv *",
-   "referenced_type" : "type-8",
-   "self_type" : "type-7",
+   "referenced_type" : "_ZTI7_JNIEnv",
+   "self_type" : "_ZTIP7_JNIEnv",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7580,8 +7490,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP7_JavaVM",
    "name" : "_JavaVM *",
-   "referenced_type" : "type-523",
-   "self_type" : "type-522",
+   "referenced_type" : "_ZTI7_JavaVM",
+   "self_type" : "_ZTIP7_JavaVM",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7589,8 +7499,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP7_jarray",
    "name" : "_jarray *",
-   "referenced_type" : "type-386",
-   "self_type" : "type-385",
+   "referenced_type" : "_ZTI7_jarray",
+   "self_type" : "_ZTIP7_jarray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7598,8 +7508,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP7_jclass",
    "name" : "_jclass *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-19",
+   "referenced_type" : "_ZTI7_jclass",
+   "self_type" : "_ZTIP7_jclass",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7607,89 +7517,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP8AIBinder",
    "name" : "AIBinder *",
-   "referenced_type" : "type-557",
-   "self_type" : "type-556",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-570",
-   "self_type" : "type-569",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-573",
-   "self_type" : "type-572",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-580",
-   "self_type" : "type-579",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-592",
-   "self_type" : "type-591",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-617",
-   "self_type" : "type-616",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-671",
-   "self_type" : "type-670",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-689",
-   "self_type" : "type-688",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-696",
-   "self_type" : "type-695",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-700",
-   "self_type" : "type-699",
+   "referenced_type" : "_ZTI8AIBinder",
+   "self_type" : "_ZTIP8AIBinder",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -7697,8 +7526,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP8_jobject",
    "name" : "_jobject *",
-   "referenced_type" : "type-6",
-   "self_type" : "type-5",
+   "referenced_type" : "_ZTI8_jobject",
+   "self_type" : "_ZTIP8_jobject",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7706,17 +7535,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP8_jstring",
    "name" : "_jstring *",
-   "referenced_type" : "type-367",
-   "self_type" : "type-366",
-   "size" : 4,
-   "source_file" : "/libnativehelper/include_jni/jni.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP9_jfieldID",
-   "name" : "_jfieldID *",
-   "referenced_type" : "type-36",
-   "self_type" : "type-35",
+   "referenced_type" : "_ZTI8_jstring",
+   "self_type" : "_ZTIP8_jstring",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7724,8 +7544,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP9_jfieldID",
    "name" : "_jfieldID *",
-   "referenced_type" : "type-721",
-   "self_type" : "type-720",
+   "referenced_type" : "_ZTI9_jfieldID",
+   "self_type" : "_ZTIP9_jfieldID",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7733,8 +7553,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPDs",
    "name" : "char16_t *",
-   "referenced_type" : "type-646",
-   "self_type" : "type-650",
+   "referenced_type" : "_ZTIDs",
+   "self_type" : "_ZTIPDs",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -7742,8 +7562,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
    "name" : "jobjectRefType (*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
+   "referenced_type" : "_ZTIF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7751,8 +7571,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP10_jintArrayP7_JNIEnviE",
    "name" : "_jintArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-412",
-   "self_type" : "type-411",
+   "referenced_type" : "_ZTIFP10_jintArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP10_jintArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7760,8 +7580,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
    "name" : "_jmethodID *(*)(_JNIEnv *, _jclass *, const char *, const char *)",
-   "referenced_type" : "type-86",
-   "self_type" : "type-85",
+   "referenced_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
+   "self_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7769,8 +7589,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP10_jmethodIDP7_JNIEnvP8_jobjectE",
    "name" : "_jmethodID *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-30",
-   "self_type" : "type-29",
+   "referenced_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7778,8 +7598,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP11_jbyteArrayP7_JNIEnviE",
    "name" : "_jbyteArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-400",
-   "self_type" : "type-399",
+   "referenced_type" : "_ZTIFP11_jbyteArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP11_jbyteArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7787,8 +7607,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP11_jcharArrayP7_JNIEnviE",
    "name" : "_jcharArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-404",
-   "self_type" : "type-403",
+   "referenced_type" : "_ZTIFP11_jcharArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP11_jcharArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7796,8 +7616,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP11_jlongArrayP7_JNIEnviE",
    "name" : "_jlongArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-416",
-   "self_type" : "type-415",
+   "referenced_type" : "_ZTIFP11_jlongArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP11_jlongArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7805,8 +7625,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP11_jthrowableP7_JNIEnvE",
    "name" : "_jthrowable *(*)(_JNIEnv *)",
-   "referenced_type" : "type-53",
-   "self_type" : "type-52",
+   "referenced_type" : "_ZTIFP11_jthrowableP7_JNIEnvE",
+   "self_type" : "_ZTIPFP11_jthrowableP7_JNIEnvE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7814,8 +7634,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP12_jfloatArrayP7_JNIEnviE",
    "name" : "_jfloatArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-420",
-   "self_type" : "type-419",
+   "referenced_type" : "_ZTIFP12_jfloatArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP12_jfloatArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7823,8 +7643,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP12_jshortArrayP7_JNIEnviE",
    "name" : "_jshortArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-408",
-   "self_type" : "type-407",
+   "referenced_type" : "_ZTIFP12_jshortArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP12_jshortArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7832,8 +7652,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP13_jdoubleArrayP7_JNIEnviE",
    "name" : "_jdoubleArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-424",
-   "self_type" : "type-423",
+   "referenced_type" : "_ZTIFP13_jdoubleArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP13_jdoubleArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7841,8 +7661,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
    "name" : "_jobjectArray *(*)(_JNIEnv *, int, _jclass *, _jobject *)",
-   "referenced_type" : "type-388",
-   "self_type" : "type-387",
+   "referenced_type" : "_ZTIFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
+   "self_type" : "_ZTIPFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7850,8 +7670,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP14_jbooleanArrayP7_JNIEnviE",
    "name" : "_jbooleanArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-396",
-   "self_type" : "type-395",
+   "referenced_type" : "_ZTIFP14_jbooleanArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP14_jbooleanArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7859,8 +7679,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP7_jclassP7_JNIEnvP8_jobjectE",
    "name" : "_jclass *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-82",
-   "self_type" : "type-81",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFP7_jclassP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7868,8 +7688,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP7_jclassP7_JNIEnvPKcE",
    "name" : "_jclass *(*)(_JNIEnv *, const char *)",
-   "referenced_type" : "type-28",
-   "self_type" : "type-27",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvPKcE",
+   "self_type" : "_ZTIPFP7_jclassP7_JNIEnvPKcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7877,8 +7697,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
    "name" : "_jclass *(*)(_JNIEnv *, const char *, _jobject *, const signed char *, int)",
-   "referenced_type" : "type-18",
-   "self_type" : "type-17",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
+   "self_type" : "_ZTIPFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7886,8 +7706,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP7_jclassP7_JNIEnvS0_E",
    "name" : "_jclass *(*)(_JNIEnv *, _jclass *)",
-   "referenced_type" : "type-41",
-   "self_type" : "type-40",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvS0_E",
+   "self_type" : "_ZTIPFP7_jclassP7_JNIEnvS0_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7895,8 +7715,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobjectArray *, int)",
-   "referenced_type" : "type-392",
-   "self_type" : "type-391",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7904,8 +7724,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *)",
-   "referenced_type" : "type-4",
-   "self_type" : "type-3",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7913,8 +7733,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-72",
-   "self_type" : "type-71",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7922,8 +7742,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-69",
-   "self_type" : "type-68",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7931,8 +7751,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jmethodID *, unsigned char)",
-   "referenced_type" : "type-38",
-   "self_type" : "type-37",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7940,8 +7760,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-67",
-   "self_type" : "type-66",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7949,8 +7769,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-329",
-   "self_type" : "type-328",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7958,8 +7778,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jfieldID *, unsigned char)",
-   "referenced_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7967,8 +7787,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvPvxE",
    "name" : "_jobject *(*)(_JNIEnv *, void *, long long)",
-   "referenced_type" : "type-547",
-   "self_type" : "type-546",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvPvxE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvPvxE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7976,8 +7796,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-61",
-   "self_type" : "type-60",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_E",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7985,8 +7805,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-93",
-   "self_type" : "type-92",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7994,8 +7814,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDSt9__va_listE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-90",
-   "self_type" : "type-89",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8003,8 +7823,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-88",
-   "self_type" : "type-87",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8012,8 +7832,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-163",
-   "self_type" : "type-162",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8021,8 +7841,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-160",
-   "self_type" : "type-159",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8030,8 +7850,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-158",
-   "self_type" : "type-157",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8039,8 +7859,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-230",
-   "self_type" : "type-229",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8048,8 +7868,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jstringP7_JNIEnvPKcE",
    "name" : "_jstring *(*)(_JNIEnv *, const char *)",
-   "referenced_type" : "type-378",
-   "self_type" : "type-377",
+   "referenced_type" : "_ZTIFP8_jstringP7_JNIEnvPKcE",
+   "self_type" : "_ZTIPFP8_jstringP7_JNIEnvPKcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8057,8 +7877,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jstringP7_JNIEnvPKtiE",
    "name" : "_jstring *(*)(_JNIEnv *, const unsigned short *, int)",
-   "referenced_type" : "type-365",
-   "self_type" : "type-364",
+   "referenced_type" : "_ZTIFP8_jstringP7_JNIEnvPKtiE",
+   "self_type" : "_ZTIPFP8_jstringP7_JNIEnvPKtiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8066,8 +7886,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
    "name" : "_jfieldID *(*)(_JNIEnv *, _jclass *, const char *, const char *)",
-   "referenced_type" : "type-228",
-   "self_type" : "type-227",
+   "referenced_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
+   "self_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8075,8 +7895,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP9_jfieldIDP7_JNIEnvP8_jobjectE",
    "name" : "_jfieldID *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-34",
-   "self_type" : "type-33",
+   "referenced_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8084,8 +7904,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPKcP7_JNIEnvP8_jstringPhE",
    "name" : "const char *(*)(_JNIEnv *, _jstring *, unsigned char *)",
-   "referenced_type" : "type-380",
-   "self_type" : "type-379",
+   "referenced_type" : "_ZTIFPKcP7_JNIEnvP8_jstringPhE",
+   "self_type" : "_ZTIPFPKcP7_JNIEnvP8_jstringPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8093,8 +7913,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPKcPKvjPiE",
    "name" : "const char *(*)(const void *, unsigned int, int *)",
-   "referenced_type" : "type-630",
-   "self_type" : "type-631",
+   "referenced_type" : "_ZTIFPKcPKvjPiE",
+   "self_type" : "_ZTIPFPKcPKvjPiE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8102,8 +7922,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPKtP7_JNIEnvP8_jstringPhE",
    "name" : "const unsigned short *(*)(_JNIEnv *, _jstring *, unsigned char *)",
-   "referenced_type" : "type-373",
-   "self_type" : "type-372",
+   "referenced_type" : "_ZTIFPKtP7_JNIEnvP8_jstringPhE",
+   "self_type" : "_ZTIPFPKtP7_JNIEnvP8_jstringPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8111,8 +7931,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPaP7_JNIEnvP11_jbyteArrayPhE",
    "name" : "signed char *(*)(_JNIEnv *, _jbyteArray *, unsigned char *)",
-   "referenced_type" : "type-430",
-   "self_type" : "type-429",
+   "referenced_type" : "_ZTIFPaP7_JNIEnvP11_jbyteArrayPhE",
+   "self_type" : "_ZTIPFPaP7_JNIEnvP11_jbyteArrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8120,8 +7940,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPdP7_JNIEnvP13_jdoubleArrayPhE",
    "name" : "double *(*)(_JNIEnv *, _jdoubleArray *, unsigned char *)",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
+   "referenced_type" : "_ZTIFPdP7_JNIEnvP13_jdoubleArrayPhE",
+   "self_type" : "_ZTIPFPdP7_JNIEnvP13_jdoubleArrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8129,8 +7949,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPfP7_JNIEnvP12_jfloatArrayPhE",
    "name" : "float *(*)(_JNIEnv *, _jfloatArray *, unsigned char *)",
-   "referenced_type" : "type-445",
-   "self_type" : "type-444",
+   "referenced_type" : "_ZTIFPfP7_JNIEnvP12_jfloatArrayPhE",
+   "self_type" : "_ZTIPFPfP7_JNIEnvP12_jfloatArrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8138,8 +7958,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPhP7_JNIEnvP14_jbooleanArrayS_E",
    "name" : "unsigned char *(*)(_JNIEnv *, _jbooleanArray *, unsigned char *)",
-   "referenced_type" : "type-428",
-   "self_type" : "type-427",
+   "referenced_type" : "_ZTIFPhP7_JNIEnvP14_jbooleanArrayS_E",
+   "self_type" : "_ZTIPFPhP7_JNIEnvP14_jbooleanArrayS_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8147,8 +7967,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPiP7_JNIEnvP10_jintArrayPhE",
    "name" : "int *(*)(_JNIEnv *, _jintArray *, unsigned char *)",
-   "referenced_type" : "type-439",
-   "self_type" : "type-438",
+   "referenced_type" : "_ZTIFPiP7_JNIEnvP10_jintArrayPhE",
+   "self_type" : "_ZTIPFPiP7_JNIEnvP10_jintArrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8156,8 +7976,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPsP7_JNIEnvP12_jshortArrayPhE",
    "name" : "short *(*)(_JNIEnv *, _jshortArray *, unsigned char *)",
-   "referenced_type" : "type-436",
-   "self_type" : "type-435",
+   "referenced_type" : "_ZTIFPsP7_JNIEnvP12_jshortArrayPhE",
+   "self_type" : "_ZTIPFPsP7_JNIEnvP12_jshortArrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8165,8 +7985,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPtP7_JNIEnvP11_jcharArrayPhE",
    "name" : "unsigned short *(*)(_JNIEnv *, _jcharArray *, unsigned char *)",
-   "referenced_type" : "type-433",
-   "self_type" : "type-432",
+   "referenced_type" : "_ZTIFPtP7_JNIEnvP11_jcharArrayPhE",
+   "self_type" : "_ZTIPFPtP7_JNIEnvP11_jcharArrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8174,8 +7994,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPvP7_JNIEnvP7_jarrayPhE",
    "name" : "void *(*)(_JNIEnv *, _jarray *, unsigned char *)",
-   "referenced_type" : "type-541",
-   "self_type" : "type-540",
+   "referenced_type" : "_ZTIFPvP7_JNIEnvP7_jarrayPhE",
+   "self_type" : "_ZTIPFPvP7_JNIEnvP7_jarrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8183,8 +8003,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPvP7_JNIEnvP8_jobjectE",
    "name" : "void *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-549",
-   "self_type" : "type-548",
+   "referenced_type" : "_ZTIFPvP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFPvP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8192,8 +8012,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPvS_E",
    "name" : "void *(*)(void *)",
-   "referenced_type" : "type-610",
-   "self_type" : "type-611",
+   "referenced_type" : "_ZTIFPvS_E",
+   "self_type" : "_ZTIPFPvS_E",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -8201,8 +8021,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPxP7_JNIEnvP11_jlongArrayPhE",
    "name" : "long long *(*)(_JNIEnv *, _jlongArray *, unsigned char *)",
-   "referenced_type" : "type-442",
-   "self_type" : "type-441",
+   "referenced_type" : "_ZTIFPxP7_JNIEnvP11_jlongArrayPhE",
+   "self_type" : "_ZTIPFPxP7_JNIEnvP11_jlongArrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8210,8 +8030,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "signed char (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-278",
-   "self_type" : "type-277",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8219,8 +8039,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "signed char (*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-275",
-   "self_type" : "type-274",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8228,8 +8048,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "signed char (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-273",
-   "self_type" : "type-272",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8237,8 +8057,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "signed char (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-333",
-   "self_type" : "type-332",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8246,8 +8066,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-107",
-   "self_type" : "type-106",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8255,8 +8075,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-104",
-   "self_type" : "type-103",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8264,8 +8084,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-102",
-   "self_type" : "type-101",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8273,8 +8093,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-177",
-   "self_type" : "type-176",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8282,8 +8102,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-174",
-   "self_type" : "type-173",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8291,8 +8111,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-172",
-   "self_type" : "type-171",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8300,8 +8120,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-234",
-   "self_type" : "type-233",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8309,8 +8129,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPKvjE",
    "name" : "bool (*)(const void *, unsigned int)",
-   "referenced_type" : "type-655",
-   "self_type" : "type-656",
+   "referenced_type" : "_ZTIFbPKvjE",
+   "self_type" : "_ZTIPFbPKvjE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8318,8 +8138,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviE",
    "name" : "bool (*)(void *, int)",
-   "referenced_type" : "type-634",
-   "self_type" : "type-635",
+   "referenced_type" : "_ZTIFbPviE",
+   "self_type" : "_ZTIPFbPviE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8327,8 +8147,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPDsE",
    "name" : "bool (*)(void *, int, char16_t **)",
-   "referenced_type" : "type-682",
-   "self_type" : "type-684",
+   "referenced_type" : "_ZTIFbPviPPDsE",
+   "self_type" : "_ZTIPFbPviPPDsE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8336,8 +8156,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPaE",
    "name" : "bool (*)(void *, int, signed char **)",
-   "referenced_type" : "type-685",
-   "self_type" : "type-687",
+   "referenced_type" : "_ZTIFbPviPPaE",
+   "self_type" : "_ZTIPFbPviPPaE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8345,8 +8165,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPcE",
    "name" : "bool (*)(void *, int, char **)",
-   "referenced_type" : "type-625",
-   "self_type" : "type-627",
+   "referenced_type" : "_ZTIFbPviPPcE",
+   "self_type" : "_ZTIPFbPviPPcE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8354,8 +8174,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPdE",
    "name" : "bool (*)(void *, int, double **)",
-   "referenced_type" : "type-676",
-   "self_type" : "type-678",
+   "referenced_type" : "_ZTIFbPviPPdE",
+   "self_type" : "_ZTIPFbPviPPdE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8363,8 +8183,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPfE",
    "name" : "bool (*)(void *, int, float **)",
-   "referenced_type" : "type-673",
-   "self_type" : "type-675",
+   "referenced_type" : "_ZTIFbPviPPfE",
+   "self_type" : "_ZTIPFbPviPPfE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8372,8 +8192,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPiE",
    "name" : "bool (*)(void *, int, int **)",
-   "referenced_type" : "type-659",
-   "self_type" : "type-661",
+   "referenced_type" : "_ZTIFbPviPPiE",
+   "self_type" : "_ZTIPFbPviPPiE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8381,8 +8201,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPjE",
    "name" : "bool (*)(void *, int, unsigned int **)",
-   "referenced_type" : "type-662",
-   "self_type" : "type-664",
+   "referenced_type" : "_ZTIFbPviPPjE",
+   "self_type" : "_ZTIPFbPviPPjE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8390,8 +8210,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPxE",
    "name" : "bool (*)(void *, int, long long **)",
-   "referenced_type" : "type-665",
-   "self_type" : "type-667",
+   "referenced_type" : "_ZTIFbPviPPxE",
+   "self_type" : "_ZTIPFbPviPPxE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8399,8 +8219,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPyE",
    "name" : "bool (*)(void *, int, unsigned long long **)",
-   "referenced_type" : "type-668",
-   "self_type" : "type-672",
+   "referenced_type" : "_ZTIFbPviPPyE",
+   "self_type" : "_ZTIPFbPviPPyE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8408,8 +8228,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPvjiPPcE",
    "name" : "bool (*)(void *, unsigned int, int, char **)",
-   "referenced_type" : "type-636",
-   "self_type" : "type-637",
+   "referenced_type" : "_ZTIFbPvjiPPcE",
+   "self_type" : "_ZTIPFbPvjiPPcE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8417,8 +8237,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-320",
-   "self_type" : "type-319",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8426,8 +8246,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-317",
-   "self_type" : "type-316",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8435,8 +8255,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-315",
-   "self_type" : "type-314",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8444,8 +8264,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-345",
-   "self_type" : "type-344",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8453,8 +8273,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-149",
-   "self_type" : "type-148",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8462,8 +8282,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-146",
-   "self_type" : "type-145",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8471,8 +8291,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-144",
-   "self_type" : "type-143",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8480,8 +8300,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-219",
-   "self_type" : "type-218",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8489,8 +8309,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-216",
-   "self_type" : "type-215",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8498,8 +8318,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-214",
-   "self_type" : "type-213",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8507,8 +8327,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-246",
-   "self_type" : "type-245",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8516,8 +8336,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "float (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-313",
-   "self_type" : "type-312",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8525,8 +8345,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "float (*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-310",
-   "self_type" : "type-309",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8534,8 +8354,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "float (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8543,8 +8363,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "float (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-343",
-   "self_type" : "type-342",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8552,8 +8372,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-142",
-   "self_type" : "type-141",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8561,8 +8381,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8570,8 +8390,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-137",
-   "self_type" : "type-136",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8579,8 +8399,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-212",
-   "self_type" : "type-211",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8588,8 +8408,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-209",
-   "self_type" : "type-208",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8597,8 +8417,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-207",
-   "self_type" : "type-206",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8606,8 +8426,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-244",
-   "self_type" : "type-243",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8615,8 +8435,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvE",
    "name" : "unsigned char (*)(_JNIEnv *)",
-   "referenced_type" : "type-545",
-   "self_type" : "type-544",
+   "referenced_type" : "_ZTIFhP7_JNIEnvE",
+   "self_type" : "_ZTIPFhP7_JNIEnvE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8624,8 +8444,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-271",
-   "self_type" : "type-270",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8633,8 +8453,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-268",
-   "self_type" : "type-267",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8642,8 +8462,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-266",
-   "self_type" : "type-265",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8651,8 +8471,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-331",
-   "self_type" : "type-330",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8660,8 +8480,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassS2_E",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jclass *)",
-   "referenced_type" : "type-43",
-   "self_type" : "type-42",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassS2_E",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassS2_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8669,8 +8489,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-100",
-   "self_type" : "type-99",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8678,8 +8498,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8687,8 +8507,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-95",
-   "self_type" : "type-94",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8696,8 +8516,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jclass *)",
-   "referenced_type" : "type-84",
-   "self_type" : "type-83",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8705,8 +8525,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-170",
-   "self_type" : "type-169",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8714,8 +8534,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-167",
-   "self_type" : "type-166",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8723,8 +8543,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-165",
-   "self_type" : "type-164",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8732,8 +8552,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-232",
-   "self_type" : "type-231",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8741,8 +8561,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectS2_E",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jobject *)",
-   "referenced_type" : "type-65",
-   "self_type" : "type-64",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectS2_E",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectS2_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8750,8 +8570,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7AParcelPKvjE",
    "name" : "int (*)(AParcel *, const void *, unsigned int)",
-   "referenced_type" : "type-638",
-   "self_type" : "type-639",
+   "referenced_type" : "_ZTIFiP7AParcelPKvjE",
+   "self_type" : "_ZTIPFiP7AParcelPKvjE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8759,8 +8579,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvE",
    "name" : "int (*)(_JNIEnv *)",
-   "referenced_type" : "type-15",
-   "self_type" : "type-14",
+   "referenced_type" : "_ZTIFiP7_JNIEnvE",
+   "self_type" : "_ZTIPFiP7_JNIEnvE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8768,8 +8588,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP11_jthrowableE",
    "name" : "int (*)(_JNIEnv *, _jthrowable *)",
-   "referenced_type" : "type-47",
-   "self_type" : "type-46",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP11_jthrowableE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP11_jthrowableE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8777,8 +8597,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jarrayE",
    "name" : "int (*)(_JNIEnv *, _jarray *)",
-   "referenced_type" : "type-384",
-   "self_type" : "type-383",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jarrayE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jarrayE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8786,8 +8606,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassE",
    "name" : "int (*)(_JNIEnv *, _jclass *)",
-   "referenced_type" : "type-516",
-   "self_type" : "type-515",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8795,8 +8615,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "int (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-299",
-   "self_type" : "type-298",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8804,8 +8624,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "int (*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-296",
-   "self_type" : "type-295",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8813,8 +8633,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "int (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-294",
-   "self_type" : "type-293",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8822,8 +8642,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "int (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-339",
-   "self_type" : "type-338",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8831,8 +8651,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
    "name" : "int (*)(_JNIEnv *, _jclass *, const JNINativeMethod *, int)",
-   "referenced_type" : "type-511",
-   "self_type" : "type-510",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8840,8 +8660,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassPKcE",
    "name" : "int (*)(_JNIEnv *, _jclass *, const char *)",
-   "referenced_type" : "type-51",
-   "self_type" : "type-50",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassPKcE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassPKcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8849,8 +8669,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectE",
    "name" : "int (*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-518",
-   "self_type" : "type-517",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8858,8 +8678,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-128",
-   "self_type" : "type-127",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8867,8 +8687,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-125",
-   "self_type" : "type-124",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8876,8 +8696,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-123",
-   "self_type" : "type-122",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8885,8 +8705,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-198",
-   "self_type" : "type-197",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8894,8 +8714,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-195",
-   "self_type" : "type-194",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8903,8 +8723,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-193",
-   "self_type" : "type-192",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8912,8 +8732,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-240",
-   "self_type" : "type-239",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8921,8 +8741,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jstringE",
    "name" : "int (*)(_JNIEnv *, _jstring *)",
-   "referenced_type" : "type-371",
-   "self_type" : "type-370",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jstringE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jstringE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8930,8 +8750,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvPP7_JavaVME",
    "name" : "int (*)(_JNIEnv *, _JavaVM **)",
-   "referenced_type" : "type-520",
-   "self_type" : "type-519",
+   "referenced_type" : "_ZTIFiP7_JNIEnvPP7_JavaVME",
+   "self_type" : "_ZTIPFiP7_JNIEnvPP7_JavaVME",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8939,8 +8759,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnviE",
    "name" : "int (*)(_JNIEnv *, int)",
-   "referenced_type" : "type-59",
-   "self_type" : "type-58",
+   "referenced_type" : "_ZTIFiP7_JNIEnviE",
+   "self_type" : "_ZTIPFiP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8948,8 +8768,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JavaVME",
    "name" : "int (*)(_JavaVM *)",
-   "referenced_type" : "type-528",
-   "self_type" : "type-527",
+   "referenced_type" : "_ZTIFiP7_JavaVME",
+   "self_type" : "_ZTIPFiP7_JavaVME",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8957,8 +8777,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JavaVMPP7_JNIEnvPvE",
    "name" : "int (*)(_JavaVM *, _JNIEnv **, void *)",
-   "referenced_type" : "type-530",
-   "self_type" : "type-529",
+   "referenced_type" : "_ZTIFiP7_JavaVMPP7_JNIEnvPvE",
+   "self_type" : "_ZTIPFiP7_JavaVMPP7_JNIEnvPvE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8966,8 +8786,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JavaVMPPviE",
    "name" : "int (*)(_JavaVM *, void **, int)",
-   "referenced_type" : "type-533",
-   "self_type" : "type-532",
+   "referenced_type" : "_ZTIFiP7_JavaVMPPviE",
+   "self_type" : "_ZTIPFiP7_JavaVMPPviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8975,8 +8795,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP8AIBinderiPPKcjE",
    "name" : "int (*)(AIBinder *, int, const char **, unsigned int)",
-   "referenced_type" : "type-593",
-   "self_type" : "type-595",
+   "referenced_type" : "_ZTIFiP8AIBinderiPPKcjE",
+   "self_type" : "_ZTIPFiP8AIBinderiPPKcjE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -8984,8 +8804,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP8AIBinderjPK7AParcelPS1_E",
    "name" : "int (*)(AIBinder *, unsigned int, const AParcel *, AParcel *)",
-   "referenced_type" : "type-590",
-   "self_type" : "type-589",
+   "referenced_type" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
+   "self_type" : "_ZTIPFiP8AIBinderjPK7AParcelPS1_E",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -8993,8 +8813,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiPK7AParcelPvjE",
    "name" : "int (*)(const AParcel *, void *, unsigned int)",
-   "referenced_type" : "type-640",
-   "self_type" : "type-644",
+   "referenced_type" : "_ZTIFiPK7AParcelPvjE",
+   "self_type" : "_ZTIPFiPK7AParcelPvjE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -9002,8 +8822,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "short (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-292",
-   "self_type" : "type-291",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9011,8 +8831,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "short (*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-289",
-   "self_type" : "type-288",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9020,8 +8840,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "short (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-287",
-   "self_type" : "type-286",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9029,8 +8849,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "short (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-337",
-   "self_type" : "type-336",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9038,8 +8858,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-121",
-   "self_type" : "type-120",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9047,8 +8867,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-118",
-   "self_type" : "type-117",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9056,8 +8876,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-116",
-   "self_type" : "type-115",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9065,8 +8885,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-191",
-   "self_type" : "type-190",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9074,8 +8894,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-188",
-   "self_type" : "type-187",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9083,8 +8903,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-186",
-   "self_type" : "type-185",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9092,8 +8912,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-238",
-   "self_type" : "type-237",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9101,8 +8921,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "unsigned short (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-285",
-   "self_type" : "type-284",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9110,8 +8930,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "unsigned short (*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-282",
-   "self_type" : "type-281",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9119,8 +8939,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "unsigned short (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-280",
-   "self_type" : "type-279",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9128,8 +8948,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "unsigned short (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-335",
-   "self_type" : "type-334",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9137,8 +8957,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-114",
-   "self_type" : "type-113",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9146,8 +8966,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-111",
-   "self_type" : "type-110",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9155,8 +8975,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-109",
-   "self_type" : "type-108",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9164,8 +8984,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-184",
-   "self_type" : "type-183",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9173,8 +8993,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9182,8 +9002,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-179",
-   "self_type" : "type-178",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9191,8 +9011,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-236",
-   "self_type" : "type-235",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9200,8 +9020,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvE",
    "name" : "void (*)(_JNIEnv *)",
-   "referenced_type" : "type-55",
-   "self_type" : "type-54",
+   "referenced_type" : "_ZTIFvP7_JNIEnvE",
+   "self_type" : "_ZTIPFvP7_JNIEnvE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9209,8 +9029,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP10_jintArrayPiiE",
    "name" : "void (*)(_JNIEnv *, _jintArray *, int *, int)",
-   "referenced_type" : "type-459",
-   "self_type" : "type-458",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayPiiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayPiiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9218,8 +9038,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPKiE",
    "name" : "void (*)(_JNIEnv *, _jintArray *, int, int, const int *)",
-   "referenced_type" : "type-495",
-   "self_type" : "type-494",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPKiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPKiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9227,8 +9047,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPiE",
    "name" : "void (*)(_JNIEnv *, _jintArray *, int, int, int *)",
-   "referenced_type" : "type-475",
-   "self_type" : "type-474",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9236,8 +9056,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayPaiE",
    "name" : "void (*)(_JNIEnv *, _jbyteArray *, signed char *, int)",
-   "referenced_type" : "type-453",
-   "self_type" : "type-452",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayPaiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayPaiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9245,8 +9065,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPKaE",
    "name" : "void (*)(_JNIEnv *, _jbyteArray *, int, int, const signed char *)",
-   "referenced_type" : "type-487",
-   "self_type" : "type-486",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPKaE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPKaE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9254,8 +9074,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPaE",
    "name" : "void (*)(_JNIEnv *, _jbyteArray *, int, int, signed char *)",
-   "referenced_type" : "type-469",
-   "self_type" : "type-468",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPaE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPaE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9263,8 +9083,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jcharArrayPtiE",
    "name" : "void (*)(_JNIEnv *, _jcharArray *, unsigned short *, int)",
-   "referenced_type" : "type-455",
-   "self_type" : "type-454",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayPtiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayPtiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9272,8 +9092,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPKtE",
    "name" : "void (*)(_JNIEnv *, _jcharArray *, int, int, const unsigned short *)",
-   "referenced_type" : "type-489",
-   "self_type" : "type-488",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPKtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPKtE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9281,8 +9101,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPtE",
    "name" : "void (*)(_JNIEnv *, _jcharArray *, int, int, unsigned short *)",
-   "referenced_type" : "type-471",
-   "self_type" : "type-470",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPtE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9290,8 +9110,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jlongArrayPxiE",
    "name" : "void (*)(_JNIEnv *, _jlongArray *, long long *, int)",
-   "referenced_type" : "type-461",
-   "self_type" : "type-460",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayPxiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayPxiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9299,8 +9119,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPKxE",
    "name" : "void (*)(_JNIEnv *, _jlongArray *, int, int, const long long *)",
-   "referenced_type" : "type-499",
-   "self_type" : "type-498",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPKxE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPKxE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9308,8 +9128,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPxE",
    "name" : "void (*)(_JNIEnv *, _jlongArray *, int, int, long long *)",
-   "referenced_type" : "type-477",
-   "self_type" : "type-476",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPxE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPxE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9317,8 +9137,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayPfiE",
    "name" : "void (*)(_JNIEnv *, _jfloatArray *, float *, int)",
-   "referenced_type" : "type-463",
-   "self_type" : "type-462",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayPfiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayPfiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9326,8 +9146,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPKfE",
    "name" : "void (*)(_JNIEnv *, _jfloatArray *, int, int, const float *)",
-   "referenced_type" : "type-503",
-   "self_type" : "type-502",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPKfE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPKfE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9335,8 +9155,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPfE",
    "name" : "void (*)(_JNIEnv *, _jfloatArray *, int, int, float *)",
-   "referenced_type" : "type-479",
-   "self_type" : "type-478",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPfE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPfE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9344,8 +9164,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jshortArrayPsiE",
    "name" : "void (*)(_JNIEnv *, _jshortArray *, short *, int)",
-   "referenced_type" : "type-457",
-   "self_type" : "type-456",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayPsiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayPsiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9353,8 +9173,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPKsE",
    "name" : "void (*)(_JNIEnv *, _jshortArray *, int, int, const short *)",
-   "referenced_type" : "type-491",
-   "self_type" : "type-490",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPKsE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPKsE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9362,8 +9182,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPsE",
    "name" : "void (*)(_JNIEnv *, _jshortArray *, int, int, short *)",
-   "referenced_type" : "type-473",
-   "self_type" : "type-472",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPsE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPsE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9371,8 +9191,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayPdiE",
    "name" : "void (*)(_JNIEnv *, _jdoubleArray *, double *, int)",
-   "referenced_type" : "type-465",
-   "self_type" : "type-464",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayPdiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayPdiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9380,8 +9200,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
    "name" : "void (*)(_JNIEnv *, _jdoubleArray *, int, int, const double *)",
-   "referenced_type" : "type-507",
-   "self_type" : "type-506",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9389,8 +9209,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPdE",
    "name" : "void (*)(_JNIEnv *, _jdoubleArray *, int, int, double *)",
-   "referenced_type" : "type-481",
-   "self_type" : "type-480",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPdE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPdE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9398,8 +9218,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
    "name" : "void (*)(_JNIEnv *, _jobjectArray *, int, _jobject *)",
-   "referenced_type" : "type-394",
-   "self_type" : "type-393",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9407,8 +9227,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayPhiE",
    "name" : "void (*)(_JNIEnv *, _jbooleanArray *, unsigned char *, int)",
-   "referenced_type" : "type-451",
-   "self_type" : "type-450",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayPhiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayPhiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9416,8 +9236,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
    "name" : "void (*)(_JNIEnv *, _jbooleanArray *, int, int, const unsigned char *)",
-   "referenced_type" : "type-483",
-   "self_type" : "type-482",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9425,8 +9245,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPhE",
    "name" : "void (*)(_JNIEnv *, _jbooleanArray *, int, int, unsigned char *)",
-   "referenced_type" : "type-467",
-   "self_type" : "type-466",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPhE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9434,8 +9254,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jarrayPviE",
    "name" : "void (*)(_JNIEnv *, _jarray *, void *, int)",
-   "referenced_type" : "type-543",
-   "self_type" : "type-542",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jarrayPviE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jarrayPviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9443,8 +9263,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-327",
-   "self_type" : "type-326",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9452,8 +9272,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-324",
-   "self_type" : "type-323",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9461,8 +9281,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-322",
-   "self_type" : "type-321",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9470,8 +9290,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, _jobject *)",
-   "referenced_type" : "type-347",
-   "self_type" : "type-346",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9479,8 +9299,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, signed char)",
-   "referenced_type" : "type-351",
-   "self_type" : "type-350",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9488,8 +9308,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, double)",
-   "referenced_type" : "type-363",
-   "self_type" : "type-362",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9497,8 +9317,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, float)",
-   "referenced_type" : "type-361",
-   "self_type" : "type-360",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9506,8 +9326,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, unsigned char)",
-   "referenced_type" : "type-349",
-   "self_type" : "type-348",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9515,8 +9335,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, int)",
-   "referenced_type" : "type-357",
-   "self_type" : "type-356",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9524,8 +9344,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, short)",
-   "referenced_type" : "type-355",
-   "self_type" : "type-354",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9533,8 +9353,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, unsigned short)",
-   "referenced_type" : "type-353",
-   "self_type" : "type-352",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9542,8 +9362,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDxE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, long long)",
-   "referenced_type" : "type-359",
-   "self_type" : "type-358",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDxE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDxE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9551,8 +9371,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectE",
    "name" : "void (*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9560,8 +9380,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-156",
-   "self_type" : "type-155",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9569,8 +9389,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-153",
-   "self_type" : "type-152",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9578,8 +9398,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-151",
-   "self_type" : "type-150",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9587,8 +9407,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-226",
-   "self_type" : "type-225",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9596,8 +9416,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-223",
-   "self_type" : "type-222",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9605,8 +9425,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-221",
-   "self_type" : "type-220",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9614,8 +9434,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, _jobject *)",
-   "referenced_type" : "type-248",
-   "self_type" : "type-247",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9623,8 +9443,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, signed char)",
-   "referenced_type" : "type-252",
-   "self_type" : "type-251",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9632,8 +9452,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, double)",
-   "referenced_type" : "type-264",
-   "self_type" : "type-263",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9641,8 +9461,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, float)",
-   "referenced_type" : "type-262",
-   "self_type" : "type-261",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9650,8 +9470,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, unsigned char)",
-   "referenced_type" : "type-250",
-   "self_type" : "type-249",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9659,8 +9479,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, int)",
-   "referenced_type" : "type-258",
-   "self_type" : "type-257",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9668,8 +9488,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, short)",
-   "referenced_type" : "type-256",
-   "self_type" : "type-255",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9677,8 +9497,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, unsigned short)",
-   "referenced_type" : "type-254",
-   "self_type" : "type-253",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9686,8 +9506,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDxE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, long long)",
-   "referenced_type" : "type-260",
-   "self_type" : "type-259",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDxE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDxE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9695,8 +9515,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jstringPKcE",
    "name" : "void (*)(_JNIEnv *, _jstring *, const char *)",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringPKcE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9704,8 +9524,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jstringPKtE",
    "name" : "void (*)(_JNIEnv *, _jstring *, const unsigned short *)",
-   "referenced_type" : "type-376",
-   "self_type" : "type-375",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringPKtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKtE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9713,8 +9533,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jstringiiPcE",
    "name" : "void (*)(_JNIEnv *, _jstring *, int, int, char *)",
-   "referenced_type" : "type-538",
-   "self_type" : "type-537",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPcE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jstringiiPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9722,8 +9542,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jstringiiPtE",
    "name" : "void (*)(_JNIEnv *, _jstring *, int, int, unsigned short *)",
-   "referenced_type" : "type-536",
-   "self_type" : "type-535",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jstringiiPtE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9731,8 +9551,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvPKcE",
    "name" : "void (*)(_JNIEnv *, const char *)",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "_ZTIFvP7_JNIEnvPKcE",
+   "self_type" : "_ZTIPFvP7_JNIEnvPKcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9740,8 +9560,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvPvE",
    "name" : "void (*)(void *)",
-   "referenced_type" : "type-602",
-   "self_type" : "type-618",
+   "referenced_type" : "_ZTIFvPvE",
+   "self_type" : "_ZTIPFvPvE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9749,8 +9569,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvPvjbE",
    "name" : "void (*)(void *, unsigned int, bool)",
-   "referenced_type" : "type-679",
-   "self_type" : "type-680",
+   "referenced_type" : "_ZTIFvPvjbE",
+   "self_type" : "_ZTIPFvPvjbE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -9758,8 +9578,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "long long (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-306",
-   "self_type" : "type-305",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9767,8 +9587,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "long long (*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-303",
-   "self_type" : "type-302",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9776,8 +9596,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "long long (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-301",
-   "self_type" : "type-300",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9785,8 +9605,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "long long (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-341",
-   "self_type" : "type-340",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9794,8 +9614,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectE",
    "name" : "long long (*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-551",
-   "self_type" : "type-550",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9803,8 +9623,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "long long (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-135",
-   "self_type" : "type-134",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9812,8 +9632,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "name" : "long long (*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-132",
-   "self_type" : "type-131",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9821,8 +9641,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "long long (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-130",
-   "self_type" : "type-129",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9830,8 +9650,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "long long (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-205",
-   "self_type" : "type-204",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9839,8 +9659,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "long long (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-202",
-   "self_type" : "type-201",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9848,8 +9668,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "long long (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-200",
-   "self_type" : "type-199",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9857,8 +9677,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "long long (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-242",
-   "self_type" : "type-241",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9866,8 +9686,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK14AIBinder_Class",
    "name" : "const AIBinder_Class *",
-   "referenced_type" : "type-596",
-   "self_type" : "type-598",
+   "referenced_type" : "_ZTIK14AIBinder_Class",
+   "self_type" : "_ZTIPK14AIBinder_Class",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9875,8 +9695,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK14AIBinder_Class",
    "name" : "const AIBinder_Class *",
-   "referenced_type" : "type-706",
-   "self_type" : "type-708",
+   "referenced_type" : "_ZTIK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9884,8 +9704,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK15JNINativeMethod",
    "name" : "const JNINativeMethod *",
-   "referenced_type" : "type-513",
-   "self_type" : "type-512",
+   "referenced_type" : "_ZTIK15JNINativeMethod",
+   "self_type" : "_ZTIPK15JNINativeMethod",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9893,8 +9713,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK18JNIInvokeInterface",
    "name" : "const JNIInvokeInterface *",
-   "referenced_type" : "type-525",
-   "self_type" : "type-524",
+   "referenced_type" : "_ZTIK18JNIInvokeInterface",
+   "self_type" : "_ZTIPK18JNIInvokeInterface",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9902,8 +9722,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK18JNINativeInterface",
    "name" : "const JNINativeInterface *",
-   "referenced_type" : "type-10",
-   "self_type" : "type-9",
+   "referenced_type" : "_ZTIK18JNINativeInterface",
+   "self_type" : "_ZTIPK18JNINativeInterface",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9911,8 +9731,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK6jvalue",
    "name" : "const jvalue *",
-   "referenced_type" : "type-74",
-   "self_type" : "type-73",
+   "referenced_type" : "_ZTIK6jvalue",
+   "self_type" : "_ZTIPK6jvalue",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9920,17 +9740,17 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AParcel",
    "name" : "const AParcel *",
-   "referenced_type" : "type-566",
-   "self_type" : "type-568",
+   "referenced_type" : "_ZTIK7AParcel",
+   "self_type" : "_ZTIPK7AParcel",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AParcel",
    "name" : "const AParcel *",
-   "referenced_type" : "type-585",
-   "self_type" : "type-584",
+   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9938,26 +9758,17 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AParcel",
    "name" : "const AParcel *",
-   "referenced_type" : "type-642",
-   "self_type" : "type-641",
+   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
+   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "type-701",
-   "self_type" : "type-703",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AStatus",
    "name" : "const AStatus *",
-   "referenced_type" : "type-558",
-   "self_type" : "type-560",
+   "referenced_type" : "_ZTIK7AStatus",
+   "self_type" : "_ZTIPK7AStatus",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -9965,17 +9776,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AStatus",
    "name" : "const AStatus *",
-   "referenced_type" : "type-576",
-   "self_type" : "type-578",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AStatus",
-   "name" : "const AStatus *",
-   "referenced_type" : "type-619",
-   "self_type" : "type-621",
+   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
+   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -9983,8 +9785,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AStatus",
    "name" : "const AStatus *",
-   "referenced_type" : "type-692",
-   "self_type" : "type-694",
+   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
@@ -9992,8 +9794,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK8AIBinder",
    "name" : "const AIBinder *",
-   "referenced_type" : "type-600",
-   "self_type" : "type-603",
+   "referenced_type" : "_ZTIK8AIBinder",
+   "self_type" : "_ZTIPK8AIBinder",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10001,8 +9803,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK8AIBinder",
    "name" : "const AIBinder *",
-   "referenced_type" : "type-709",
-   "self_type" : "type-711",
+   "referenced_type" : "_ZTIK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10010,8 +9812,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKDs",
    "name" : "const char16_t *",
-   "referenced_type" : "type-657",
-   "self_type" : "type-658",
+   "referenced_type" : "_ZTIKDs",
+   "self_type" : "_ZTIPKDs",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10019,8 +9821,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKa",
    "name" : "const signed char *",
-   "referenced_type" : "type-25",
-   "self_type" : "type-24",
+   "referenced_type" : "_ZTIKa",
+   "self_type" : "_ZTIPKa",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10028,8 +9830,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKc",
    "name" : "const char *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
+   "referenced_type" : "_ZTIKc",
+   "self_type" : "_ZTIPKc",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10037,8 +9839,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKd",
    "name" : "const double *",
-   "referenced_type" : "type-509",
-   "self_type" : "type-508",
+   "referenced_type" : "_ZTIKd",
+   "self_type" : "_ZTIPKd",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10046,8 +9848,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKf",
    "name" : "const float *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-504",
+   "referenced_type" : "_ZTIKf",
+   "self_type" : "_ZTIPKf",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10055,8 +9857,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKh",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-485",
-   "self_type" : "type-484",
+   "referenced_type" : "_ZTIKh",
+   "self_type" : "_ZTIPKh",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10064,8 +9866,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKi",
    "name" : "const int *",
-   "referenced_type" : "type-497",
-   "self_type" : "type-496",
+   "referenced_type" : "_ZTIKi",
+   "self_type" : "_ZTIPKi",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10073,8 +9875,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKj",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-651",
-   "self_type" : "type-652",
+   "referenced_type" : "_ZTIKj",
+   "self_type" : "_ZTIPKj",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10082,8 +9884,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKs",
    "name" : "const short *",
-   "referenced_type" : "type-493",
-   "self_type" : "type-492",
+   "referenced_type" : "_ZTIKs",
+   "self_type" : "_ZTIPKs",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10091,8 +9893,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKt",
    "name" : "const unsigned short *",
-   "referenced_type" : "type-369",
-   "self_type" : "type-368",
+   "referenced_type" : "_ZTIKt",
+   "self_type" : "_ZTIPKt",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10100,8 +9902,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKv",
    "name" : "const void *",
-   "referenced_type" : "type-628",
-   "self_type" : "type-629",
+   "referenced_type" : "_ZTIKv",
+   "self_type" : "_ZTIPKv",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10109,8 +9911,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKx",
    "name" : "const long long *",
-   "referenced_type" : "type-501",
-   "self_type" : "type-500",
+   "referenced_type" : "_ZTIKx",
+   "self_type" : "_ZTIPKx",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10118,8 +9920,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKy",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-653",
-   "self_type" : "type-654",
+   "referenced_type" : "_ZTIKy",
+   "self_type" : "_ZTIPKy",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10127,8 +9929,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP7AParcel",
    "name" : "AParcel **",
-   "referenced_type" : "type-587",
-   "self_type" : "type-606",
+   "referenced_type" : "_ZTIP7AParcel",
+   "self_type" : "_ZTIPP7AParcel",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10136,8 +9938,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP7AParcel",
    "name" : "AParcel **",
-   "referenced_type" : "type-704",
-   "self_type" : "type-714",
+   "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10145,8 +9947,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP7AStatus",
    "name" : "AStatus **",
-   "referenced_type" : "type-561",
-   "self_type" : "type-563",
+   "referenced_type" : "_ZTIP7AStatus",
+   "self_type" : "_ZTIPP7AStatus",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10154,8 +9956,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP7AStatus",
    "name" : "AStatus **",
-   "referenced_type" : "type-622",
-   "self_type" : "type-624",
+   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
+   "self_type" : "_ZTIPP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10163,8 +9965,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP7_JNIEnv",
    "name" : "_JNIEnv **",
-   "referenced_type" : "type-7",
-   "self_type" : "type-531",
+   "referenced_type" : "_ZTIP7_JNIEnv",
+   "self_type" : "_ZTIPP7_JNIEnv",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10172,8 +9974,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP7_JavaVM",
    "name" : "_JavaVM **",
-   "referenced_type" : "type-522",
-   "self_type" : "type-521",
+   "referenced_type" : "_ZTIP7_JavaVM",
+   "self_type" : "_ZTIPP7_JavaVM",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10181,17 +9983,17 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP8AIBinder",
    "name" : "AIBinder **",
-   "referenced_type" : "type-569",
-   "self_type" : "type-571",
+   "referenced_type" : "_ZTIP8AIBinder",
+   "self_type" : "_ZTIPP8AIBinder",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP8AIBinder",
    "name" : "AIBinder **",
-   "referenced_type" : "type-591",
-   "self_type" : "type-609",
+   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10199,26 +10001,17 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP8AIBinder",
    "name" : "AIBinder **",
-   "referenced_type" : "type-670",
-   "self_type" : "type-681",
+   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
+   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv7-a-neon_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "type-699",
-   "self_type" : "type-717",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPDs",
    "name" : "char16_t **",
-   "referenced_type" : "type-650",
-   "self_type" : "type-683",
+   "referenced_type" : "_ZTIPDs",
+   "self_type" : "_ZTIPPDs",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10226,8 +10019,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPKc",
    "name" : "const char **",
-   "referenced_type" : "type-21",
-   "self_type" : "type-594",
+   "referenced_type" : "_ZTIPKc",
+   "self_type" : "_ZTIPPKc",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10235,8 +10028,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPa",
    "name" : "signed char **",
-   "referenced_type" : "type-431",
-   "self_type" : "type-686",
+   "referenced_type" : "_ZTIPa",
+   "self_type" : "_ZTIPPa",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10244,8 +10037,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPc",
    "name" : "char **",
-   "referenced_type" : "type-539",
-   "self_type" : "type-626",
+   "referenced_type" : "_ZTIPc",
+   "self_type" : "_ZTIPPc",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10253,8 +10046,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPd",
    "name" : "double **",
-   "referenced_type" : "type-449",
-   "self_type" : "type-677",
+   "referenced_type" : "_ZTIPd",
+   "self_type" : "_ZTIPPd",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10262,8 +10055,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPf",
    "name" : "float **",
-   "referenced_type" : "type-446",
-   "self_type" : "type-674",
+   "referenced_type" : "_ZTIPf",
+   "self_type" : "_ZTIPPf",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10271,8 +10064,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPi",
    "name" : "int **",
-   "referenced_type" : "type-440",
-   "self_type" : "type-660",
+   "referenced_type" : "_ZTIPi",
+   "self_type" : "_ZTIPPi",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10280,8 +10073,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPj",
    "name" : "unsigned int **",
-   "referenced_type" : "type-647",
-   "self_type" : "type-663",
+   "referenced_type" : "_ZTIPj",
+   "self_type" : "_ZTIPPj",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10289,8 +10082,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPv",
    "name" : "void **",
-   "referenced_type" : "type-12",
-   "self_type" : "type-534",
+   "referenced_type" : "_ZTIPv",
+   "self_type" : "_ZTIPPv",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10298,8 +10091,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPx",
    "name" : "long long **",
-   "referenced_type" : "type-443",
-   "self_type" : "type-666",
+   "referenced_type" : "_ZTIPx",
+   "self_type" : "_ZTIPPx",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10307,8 +10100,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPy",
    "name" : "unsigned long long **",
-   "referenced_type" : "type-648",
-   "self_type" : "type-669",
+   "referenced_type" : "_ZTIPy",
+   "self_type" : "_ZTIPPy",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10316,8 +10109,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPa",
    "name" : "signed char *",
-   "referenced_type" : "type-26",
-   "self_type" : "type-431",
+   "referenced_type" : "_ZTIa",
+   "self_type" : "_ZTIPa",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10325,8 +10118,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPb",
    "name" : "bool *",
-   "referenced_type" : "type-599",
-   "self_type" : "type-649",
+   "referenced_type" : "_ZTIb",
+   "self_type" : "_ZTIPb",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10334,8 +10127,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPc",
    "name" : "char *",
-   "referenced_type" : "type-23",
-   "self_type" : "type-539",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIPc",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10343,8 +10136,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPd",
    "name" : "double *",
-   "referenced_type" : "type-80",
-   "self_type" : "type-449",
+   "referenced_type" : "_ZTId",
+   "self_type" : "_ZTIPd",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10352,8 +10145,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPf",
    "name" : "float *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-446",
+   "referenced_type" : "_ZTIf",
+   "self_type" : "_ZTIPf",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10361,8 +10154,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPh",
    "name" : "unsigned char *",
-   "referenced_type" : "type-39",
-   "self_type" : "type-374",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIPh",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10370,8 +10163,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPi",
    "name" : "int *",
-   "referenced_type" : "type-16",
-   "self_type" : "type-440",
+   "referenced_type" : "_ZTIi",
+   "self_type" : "_ZTIPi",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10379,8 +10172,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPj",
    "name" : "unsigned int *",
-   "referenced_type" : "type-555",
-   "self_type" : "type-647",
+   "referenced_type" : "_ZTIj",
+   "self_type" : "_ZTIPj",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10388,8 +10181,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPs",
    "name" : "short *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-437",
+   "referenced_type" : "_ZTIs",
+   "self_type" : "_ZTIPs",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10397,8 +10190,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPt",
    "name" : "unsigned short *",
-   "referenced_type" : "type-76",
-   "self_type" : "type-434",
+   "referenced_type" : "_ZTIt",
+   "self_type" : "_ZTIPt",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10406,8 +10199,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPv",
    "name" : "void *",
-   "referenced_type" : "type-13",
-   "self_type" : "type-12",
+   "referenced_type" : "_ZTIv",
+   "self_type" : "_ZTIPv",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10415,8 +10208,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPx",
    "name" : "long long *",
-   "referenced_type" : "type-78",
-   "self_type" : "type-443",
+   "referenced_type" : "_ZTIx",
+   "self_type" : "_ZTIPx",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10424,8 +10217,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPy",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-645",
-   "self_type" : "type-648",
+   "referenced_type" : "_ZTIy",
+   "self_type" : "_ZTIPy",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   }
@@ -10437,18 +10230,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK14AIBinder_Class",
    "name" : "const AIBinder_Class",
-   "referenced_type" : "type-597",
-   "self_type" : "type-596",
-   "size" : 20,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK14AIBinder_Class",
-   "name" : "const AIBinder_Class",
-   "referenced_type" : "type-707",
-   "self_type" : "type-706",
+   "referenced_type" : "_ZTI14AIBinder_Class",
+   "self_type" : "_ZTIK14AIBinder_Class",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10457,8 +10240,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK15JNINativeMethod",
    "name" : "const JNINativeMethod",
-   "referenced_type" : "type-514",
-   "self_type" : "type-513",
+   "referenced_type" : "_ZTI15JNINativeMethod",
+   "self_type" : "_ZTIK15JNINativeMethod",
    "size" : 12,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10467,8 +10250,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK18JNIInvokeInterface",
    "name" : "const JNIInvokeInterface",
-   "referenced_type" : "type-526",
-   "self_type" : "type-525",
+   "referenced_type" : "_ZTI18JNIInvokeInterface",
+   "self_type" : "_ZTIK18JNIInvokeInterface",
    "size" : 32,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10477,8 +10260,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK18JNINativeInterface",
    "name" : "const JNINativeInterface",
-   "referenced_type" : "type-11",
-   "self_type" : "type-10",
+   "referenced_type" : "_ZTI18JNINativeInterface",
+   "self_type" : "_ZTIK18JNINativeInterface",
    "size" : 932,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10487,8 +10270,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK6jvalue",
    "name" : "const jvalue",
-   "referenced_type" : "type-75",
-   "self_type" : "type-74",
+   "referenced_type" : "_ZTI6jvalue",
+   "self_type" : "_ZTIK6jvalue",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10497,38 +10280,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK7AParcel",
    "name" : "const AParcel",
-   "referenced_type" : "type-567",
-   "self_type" : "type-566",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AParcel",
-   "name" : "const AParcel",
-   "referenced_type" : "type-586",
-   "self_type" : "type-585",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AParcel",
-   "name" : "const AParcel",
-   "referenced_type" : "type-643",
-   "self_type" : "type-642",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AParcel",
-   "name" : "const AParcel",
-   "referenced_type" : "type-702",
-   "self_type" : "type-701",
+   "referenced_type" : "_ZTI7AParcel",
+   "self_type" : "_ZTIK7AParcel",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10537,58 +10290,18 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK7AStatus",
    "name" : "const AStatus",
-   "referenced_type" : "type-559",
-   "self_type" : "type-558",
+   "referenced_type" : "_ZTI7AStatus",
+   "self_type" : "_ZTIK7AStatus",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIK7AStatus",
-   "name" : "const AStatus",
-   "referenced_type" : "type-577",
-   "self_type" : "type-576",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AStatus",
-   "name" : "const AStatus",
-   "referenced_type" : "type-620",
-   "self_type" : "type-619",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AStatus",
-   "name" : "const AStatus",
-   "referenced_type" : "type-693",
-   "self_type" : "type-692",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK8AIBinder",
-   "name" : "const AIBinder",
-   "referenced_type" : "type-601",
-   "self_type" : "type-600",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIK8AIBinder",
    "name" : "const AIBinder",
-   "referenced_type" : "type-710",
-   "self_type" : "type-709",
+   "referenced_type" : "_ZTI8AIBinder",
+   "self_type" : "_ZTIK8AIBinder",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10597,8 +10310,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKDs",
    "name" : "const char16_t",
-   "referenced_type" : "type-646",
-   "self_type" : "type-657",
+   "referenced_type" : "_ZTIDs",
+   "self_type" : "_ZTIKDs",
    "size" : 2,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10607,8 +10320,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKa",
    "name" : "const signed char",
-   "referenced_type" : "type-26",
-   "self_type" : "type-25",
+   "referenced_type" : "_ZTIa",
+   "self_type" : "_ZTIKa",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10617,8 +10330,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKc",
    "name" : "const char",
-   "referenced_type" : "type-23",
-   "self_type" : "type-22",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIKc",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10627,8 +10340,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKd",
    "name" : "const double",
-   "referenced_type" : "type-80",
-   "self_type" : "type-509",
+   "referenced_type" : "_ZTId",
+   "self_type" : "_ZTIKd",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10637,8 +10350,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKf",
    "name" : "const float",
-   "referenced_type" : "type-79",
-   "self_type" : "type-505",
+   "referenced_type" : "_ZTIf",
+   "self_type" : "_ZTIKf",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10647,8 +10360,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKh",
    "name" : "const unsigned char",
-   "referenced_type" : "type-39",
-   "self_type" : "type-485",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIKh",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10657,8 +10370,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKi",
    "name" : "const int",
-   "referenced_type" : "type-16",
-   "self_type" : "type-497",
+   "referenced_type" : "_ZTIi",
+   "self_type" : "_ZTIKi",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10667,8 +10380,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKj",
    "name" : "const unsigned int",
-   "referenced_type" : "type-555",
-   "self_type" : "type-651",
+   "referenced_type" : "_ZTIj",
+   "self_type" : "_ZTIKj",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10677,8 +10390,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKs",
    "name" : "const short",
-   "referenced_type" : "type-77",
-   "self_type" : "type-493",
+   "referenced_type" : "_ZTIs",
+   "self_type" : "_ZTIKs",
    "size" : 2,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10687,8 +10400,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKt",
    "name" : "const unsigned short",
-   "referenced_type" : "type-76",
-   "self_type" : "type-369",
+   "referenced_type" : "_ZTIt",
+   "self_type" : "_ZTIKt",
    "size" : 2,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10696,8 +10409,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKv",
    "name" : "const void",
-   "referenced_type" : "type-13",
-   "self_type" : "type-628",
+   "referenced_type" : "_ZTIv",
+   "self_type" : "_ZTIKv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -10705,8 +10418,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKx",
    "name" : "const long long",
-   "referenced_type" : "type-78",
-   "self_type" : "type-501",
+   "referenced_type" : "_ZTIx",
+   "self_type" : "_ZTIKx",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10715,8 +10428,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKy",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-645",
-   "self_type" : "type-653",
+   "referenced_type" : "_ZTIy",
+   "self_type" : "_ZTIKy",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   }
@@ -10728,14 +10441,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI10_jintArray",
    "name" : "_jintArray",
    "record_kind" : "class",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "_ZTI10_jintArray",
+   "self_type" : "_ZTI10_jintArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10744,14 +10457,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI11_jbyteArray",
    "name" : "_jbyteArray",
    "record_kind" : "class",
-   "referenced_type" : "type-402",
-   "self_type" : "type-402",
+   "referenced_type" : "_ZTI11_jbyteArray",
+   "self_type" : "_ZTI11_jbyteArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10760,14 +10473,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI11_jcharArray",
    "name" : "_jcharArray",
    "record_kind" : "class",
-   "referenced_type" : "type-406",
-   "self_type" : "type-406",
+   "referenced_type" : "_ZTI11_jcharArray",
+   "self_type" : "_ZTI11_jcharArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10776,14 +10489,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI11_jlongArray",
    "name" : "_jlongArray",
    "record_kind" : "class",
-   "referenced_type" : "type-418",
-   "self_type" : "type-418",
+   "referenced_type" : "_ZTI11_jlongArray",
+   "self_type" : "_ZTI11_jlongArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10792,14 +10505,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTI8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI11_jthrowable",
    "name" : "_jthrowable",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "_ZTI11_jthrowable",
+   "self_type" : "_ZTI11_jthrowable",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10809,18 +10522,18 @@
    [
     {
      "field_name" : "optionString",
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "field_name" : "extraInfo",
      "field_offset" : 32,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
    "linker_set_key" : "_ZTI12JavaVMOption",
    "name" : "JavaVMOption",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
+   "referenced_type" : "_ZTI12JavaVMOption",
+   "self_type" : "_ZTI12JavaVMOption",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10829,14 +10542,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI12_jfloatArray",
    "name" : "_jfloatArray",
    "record_kind" : "class",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
+   "referenced_type" : "_ZTI12_jfloatArray",
+   "self_type" : "_ZTI12_jfloatArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10845,14 +10558,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI12_jshortArray",
    "name" : "_jshortArray",
    "record_kind" : "class",
-   "referenced_type" : "type-410",
-   "self_type" : "type-410",
+   "referenced_type" : "_ZTI12_jshortArray",
+   "self_type" : "_ZTI12_jshortArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10861,14 +10574,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI13_jdoubleArray",
    "name" : "_jdoubleArray",
    "record_kind" : "class",
-   "referenced_type" : "type-426",
-   "self_type" : "type-426",
+   "referenced_type" : "_ZTI13_jdoubleArray",
+   "self_type" : "_ZTI13_jdoubleArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10877,14 +10590,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI13_jobjectArray",
    "name" : "_jobjectArray",
    "record_kind" : "class",
-   "referenced_type" : "type-390",
-   "self_type" : "type-390",
+   "referenced_type" : "_ZTI13_jobjectArray",
+   "self_type" : "_ZTI13_jobjectArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10894,28 +10607,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "nOptions",
      "field_offset" : 32,
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "options",
      "field_offset" : 64,
-     "referenced_type" : "type-615"
+     "referenced_type" : "_ZTIP12JavaVMOption"
     },
     {
      "field_name" : "ignoreUnrecognized",
      "field_offset" : 96,
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     }
    ],
    "linker_set_key" : "_ZTI14JavaVMInitArgs",
    "name" : "JavaVMInitArgs",
-   "referenced_type" : "type-614",
-   "self_type" : "type-614",
+   "referenced_type" : "_ZTI14JavaVMInitArgs",
+   "self_type" : "_ZTI14JavaVMInitArgs",
    "size" : 16,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10924,14 +10637,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI14_jbooleanArray",
    "name" : "_jbooleanArray",
    "record_kind" : "class",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
+   "referenced_type" : "_ZTI14_jbooleanArray",
+   "self_type" : "_ZTI14_jbooleanArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10941,23 +10654,23 @@
    [
     {
      "field_name" : "name",
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "field_name" : "signature",
      "field_offset" : 32,
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "field_name" : "fnPtr",
      "field_offset" : 64,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
    "linker_set_key" : "_ZTI15JNINativeMethod",
    "name" : "JNINativeMethod",
-   "referenced_type" : "type-514",
-   "self_type" : "type-514",
+   "referenced_type" : "_ZTI15JNINativeMethod",
+   "self_type" : "_ZTI15JNINativeMethod",
    "size" : 12,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10967,23 +10680,23 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "name",
      "field_offset" : 32,
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "field_name" : "group",
      "field_offset" : 64,
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI16JavaVMAttachArgs",
    "name" : "JavaVMAttachArgs",
-   "referenced_type" : "type-612",
-   "self_type" : "type-612",
+   "referenced_type" : "_ZTI16JavaVMAttachArgs",
+   "self_type" : "_ZTI16JavaVMAttachArgs",
    "size" : 12,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10993,48 +10706,48 @@
    [
     {
      "field_name" : "reserved0",
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved1",
      "field_offset" : 32,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved2",
      "field_offset" : 64,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "DestroyJavaVM",
      "field_offset" : 96,
-     "referenced_type" : "type-527"
+     "referenced_type" : "_ZTIPFiP7_JavaVME"
     },
     {
      "field_name" : "AttachCurrentThread",
      "field_offset" : 128,
-     "referenced_type" : "type-529"
+     "referenced_type" : "_ZTIPFiP7_JavaVMPP7_JNIEnvPvE"
     },
     {
      "field_name" : "DetachCurrentThread",
      "field_offset" : 160,
-     "referenced_type" : "type-527"
+     "referenced_type" : "_ZTIPFiP7_JavaVME"
     },
     {
      "field_name" : "GetEnv",
      "field_offset" : 192,
-     "referenced_type" : "type-532"
+     "referenced_type" : "_ZTIPFiP7_JavaVMPPviE"
     },
     {
      "field_name" : "AttachCurrentThreadAsDaemon",
      "field_offset" : 224,
-     "referenced_type" : "type-529"
+     "referenced_type" : "_ZTIPFiP7_JavaVMPP7_JNIEnvPvE"
     }
    ],
    "linker_set_key" : "_ZTI18JNIInvokeInterface",
    "name" : "JNIInvokeInterface",
-   "referenced_type" : "type-526",
-   "self_type" : "type-526",
+   "referenced_type" : "_ZTI18JNIInvokeInterface",
+   "self_type" : "_ZTI18JNIInvokeInterface",
    "size" : 32,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -11044,1173 +10757,1173 @@
    [
     {
      "field_name" : "reserved0",
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved1",
      "field_offset" : 32,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved2",
      "field_offset" : 64,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved3",
      "field_offset" : 96,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "GetVersion",
      "field_offset" : 128,
-     "referenced_type" : "type-14"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvE"
     },
     {
      "field_name" : "DefineClass",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "_ZTIPFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE"
     },
     {
      "field_name" : "FindClass",
      "field_offset" : 192,
-     "referenced_type" : "type-27"
+     "referenced_type" : "_ZTIPFP7_jclassP7_JNIEnvPKcE"
     },
     {
      "field_name" : "FromReflectedMethod",
      "field_offset" : 224,
-     "referenced_type" : "type-29"
+     "referenced_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "FromReflectedField",
      "field_offset" : 256,
-     "referenced_type" : "type-33"
+     "referenced_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "ToReflectedMethod",
      "field_offset" : 288,
-     "referenced_type" : "type-37"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE"
     },
     {
      "field_name" : "GetSuperclass",
      "field_offset" : 320,
-     "referenced_type" : "type-40"
+     "referenced_type" : "_ZTIPFP7_jclassP7_JNIEnvS0_E"
     },
     {
      "field_name" : "IsAssignableFrom",
      "field_offset" : 352,
-     "referenced_type" : "type-42"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassS2_E"
     },
     {
      "field_name" : "ToReflectedField",
      "field_offset" : 384,
-     "referenced_type" : "type-44"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE"
     },
     {
      "field_name" : "Throw",
      "field_offset" : 416,
-     "referenced_type" : "type-46"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP11_jthrowableE"
     },
     {
      "field_name" : "ThrowNew",
      "field_offset" : 448,
-     "referenced_type" : "type-50"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassPKcE"
     },
     {
      "field_name" : "ExceptionOccurred",
      "field_offset" : 480,
-     "referenced_type" : "type-52"
+     "referenced_type" : "_ZTIPFP11_jthrowableP7_JNIEnvE"
     },
     {
      "field_name" : "ExceptionDescribe",
      "field_offset" : 512,
-     "referenced_type" : "type-54"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvE"
     },
     {
      "field_name" : "ExceptionClear",
      "field_offset" : 544,
-     "referenced_type" : "type-54"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvE"
     },
     {
      "field_name" : "FatalError",
      "field_offset" : 576,
-     "referenced_type" : "type-56"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvPKcE"
     },
     {
      "field_name" : "PushLocalFrame",
      "field_offset" : 608,
-     "referenced_type" : "type-58"
+     "referenced_type" : "_ZTIPFiP7_JNIEnviE"
     },
     {
      "field_name" : "PopLocalFrame",
      "field_offset" : 640,
-     "referenced_type" : "type-60"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E"
     },
     {
      "field_name" : "NewGlobalRef",
      "field_offset" : 672,
-     "referenced_type" : "type-60"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E"
     },
     {
      "field_name" : "DeleteGlobalRef",
      "field_offset" : 704,
-     "referenced_type" : "type-62"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "DeleteLocalRef",
      "field_offset" : 736,
-     "referenced_type" : "type-62"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "IsSameObject",
      "field_offset" : 768,
-     "referenced_type" : "type-64"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectS2_E"
     },
     {
      "field_name" : "NewLocalRef",
      "field_offset" : 800,
-     "referenced_type" : "type-60"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E"
     },
     {
      "field_name" : "EnsureLocalCapacity",
      "field_offset" : 832,
-     "referenced_type" : "type-58"
+     "referenced_type" : "_ZTIPFiP7_JNIEnviE"
     },
     {
      "field_name" : "AllocObject",
      "field_offset" : 864,
-     "referenced_type" : "type-3"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassE"
     },
     {
      "field_name" : "NewObject",
      "field_offset" : 896,
-     "referenced_type" : "type-66"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "NewObjectV",
      "field_offset" : 928,
-     "referenced_type" : "type-68"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "NewObjectA",
      "field_offset" : 960,
-     "referenced_type" : "type-71"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "GetObjectClass",
      "field_offset" : 992,
-     "referenced_type" : "type-81"
+     "referenced_type" : "_ZTIPFP7_jclassP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "IsInstanceOf",
      "field_offset" : 1024,
-     "referenced_type" : "type-83"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassE"
     },
     {
      "field_name" : "GetMethodID",
      "field_offset" : 1056,
-     "referenced_type" : "type-85"
+     "referenced_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E"
     },
     {
      "field_name" : "CallObjectMethod",
      "field_offset" : 1088,
-     "referenced_type" : "type-87"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE"
     },
     {
      "field_name" : "CallObjectMethodV",
      "field_offset" : 1120,
-     "referenced_type" : "type-89"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallObjectMethodA",
      "field_offset" : 1152,
-     "referenced_type" : "type-92"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallBooleanMethod",
      "field_offset" : 1184,
-     "referenced_type" : "type-94"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallBooleanMethodV",
      "field_offset" : 1216,
-     "referenced_type" : "type-96"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallBooleanMethodA",
      "field_offset" : 1248,
-     "referenced_type" : "type-99"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallByteMethod",
      "field_offset" : 1280,
-     "referenced_type" : "type-101"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallByteMethodV",
      "field_offset" : 1312,
-     "referenced_type" : "type-103"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallByteMethodA",
      "field_offset" : 1344,
-     "referenced_type" : "type-106"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallCharMethod",
      "field_offset" : 1376,
-     "referenced_type" : "type-108"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallCharMethodV",
      "field_offset" : 1408,
-     "referenced_type" : "type-110"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallCharMethodA",
      "field_offset" : 1440,
-     "referenced_type" : "type-113"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallShortMethod",
      "field_offset" : 1472,
-     "referenced_type" : "type-115"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallShortMethodV",
      "field_offset" : 1504,
-     "referenced_type" : "type-117"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallShortMethodA",
      "field_offset" : 1536,
-     "referenced_type" : "type-120"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallIntMethod",
      "field_offset" : 1568,
-     "referenced_type" : "type-122"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallIntMethodV",
      "field_offset" : 1600,
-     "referenced_type" : "type-124"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallIntMethodA",
      "field_offset" : 1632,
-     "referenced_type" : "type-127"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallLongMethod",
      "field_offset" : 1664,
-     "referenced_type" : "type-129"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallLongMethodV",
      "field_offset" : 1696,
-     "referenced_type" : "type-131"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallLongMethodA",
      "field_offset" : 1728,
-     "referenced_type" : "type-134"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallFloatMethod",
      "field_offset" : 1760,
-     "referenced_type" : "type-136"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallFloatMethodV",
      "field_offset" : 1792,
-     "referenced_type" : "type-138"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallFloatMethodA",
      "field_offset" : 1824,
-     "referenced_type" : "type-141"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallDoubleMethod",
      "field_offset" : 1856,
-     "referenced_type" : "type-143"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallDoubleMethodV",
      "field_offset" : 1888,
-     "referenced_type" : "type-145"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallDoubleMethodA",
      "field_offset" : 1920,
-     "referenced_type" : "type-148"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallVoidMethod",
      "field_offset" : 1952,
-     "referenced_type" : "type-150"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallVoidMethodV",
      "field_offset" : 1984,
-     "referenced_type" : "type-152"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallVoidMethodA",
      "field_offset" : 2016,
-     "referenced_type" : "type-155"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualObjectMethod",
      "field_offset" : 2048,
-     "referenced_type" : "type-157"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualObjectMethodV",
      "field_offset" : 2080,
-     "referenced_type" : "type-159"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualObjectMethodA",
      "field_offset" : 2112,
-     "referenced_type" : "type-162"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualBooleanMethod",
      "field_offset" : 2144,
-     "referenced_type" : "type-164"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualBooleanMethodV",
      "field_offset" : 2176,
-     "referenced_type" : "type-166"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualBooleanMethodA",
      "field_offset" : 2208,
-     "referenced_type" : "type-169"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualByteMethod",
      "field_offset" : 2240,
-     "referenced_type" : "type-171"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualByteMethodV",
      "field_offset" : 2272,
-     "referenced_type" : "type-173"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualByteMethodA",
      "field_offset" : 2304,
-     "referenced_type" : "type-176"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualCharMethod",
      "field_offset" : 2336,
-     "referenced_type" : "type-178"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualCharMethodV",
      "field_offset" : 2368,
-     "referenced_type" : "type-180"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualCharMethodA",
      "field_offset" : 2400,
-     "referenced_type" : "type-183"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualShortMethod",
      "field_offset" : 2432,
-     "referenced_type" : "type-185"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualShortMethodV",
      "field_offset" : 2464,
-     "referenced_type" : "type-187"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualShortMethodA",
      "field_offset" : 2496,
-     "referenced_type" : "type-190"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualIntMethod",
      "field_offset" : 2528,
-     "referenced_type" : "type-192"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualIntMethodV",
      "field_offset" : 2560,
-     "referenced_type" : "type-194"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualIntMethodA",
      "field_offset" : 2592,
-     "referenced_type" : "type-197"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualLongMethod",
      "field_offset" : 2624,
-     "referenced_type" : "type-199"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualLongMethodV",
      "field_offset" : 2656,
-     "referenced_type" : "type-201"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualLongMethodA",
      "field_offset" : 2688,
-     "referenced_type" : "type-204"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualFloatMethod",
      "field_offset" : 2720,
-     "referenced_type" : "type-206"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualFloatMethodV",
      "field_offset" : 2752,
-     "referenced_type" : "type-208"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualFloatMethodA",
      "field_offset" : 2784,
-     "referenced_type" : "type-211"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualDoubleMethod",
      "field_offset" : 2816,
-     "referenced_type" : "type-213"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualDoubleMethodV",
      "field_offset" : 2848,
-     "referenced_type" : "type-215"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualDoubleMethodA",
      "field_offset" : 2880,
-     "referenced_type" : "type-218"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualVoidMethod",
      "field_offset" : 2912,
-     "referenced_type" : "type-220"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualVoidMethodV",
      "field_offset" : 2944,
-     "referenced_type" : "type-222"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualVoidMethodA",
      "field_offset" : 2976,
-     "referenced_type" : "type-225"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "GetFieldID",
      "field_offset" : 3008,
-     "referenced_type" : "type-227"
+     "referenced_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E"
     },
     {
      "field_name" : "GetObjectField",
      "field_offset" : 3040,
-     "referenced_type" : "type-229"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE"
     },
     {
      "field_name" : "GetBooleanField",
      "field_offset" : 3072,
-     "referenced_type" : "type-231"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetByteField",
      "field_offset" : 3104,
-     "referenced_type" : "type-233"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetCharField",
      "field_offset" : 3136,
-     "referenced_type" : "type-235"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetShortField",
      "field_offset" : 3168,
-     "referenced_type" : "type-237"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetIntField",
      "field_offset" : 3200,
-     "referenced_type" : "type-239"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetLongField",
      "field_offset" : 3232,
-     "referenced_type" : "type-241"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetFloatField",
      "field_offset" : 3264,
-     "referenced_type" : "type-243"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetDoubleField",
      "field_offset" : 3296,
-     "referenced_type" : "type-245"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "SetObjectField",
      "field_offset" : 3328,
-     "referenced_type" : "type-247"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E"
     },
     {
      "field_name" : "SetBooleanField",
      "field_offset" : 3360,
-     "referenced_type" : "type-249"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDhE"
     },
     {
      "field_name" : "SetByteField",
      "field_offset" : 3392,
-     "referenced_type" : "type-251"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDaE"
     },
     {
      "field_name" : "SetCharField",
      "field_offset" : 3424,
-     "referenced_type" : "type-253"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDtE"
     },
     {
      "field_name" : "SetShortField",
      "field_offset" : 3456,
-     "referenced_type" : "type-255"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDsE"
     },
     {
      "field_name" : "SetIntField",
      "field_offset" : 3488,
-     "referenced_type" : "type-257"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDiE"
     },
     {
      "field_name" : "SetLongField",
      "field_offset" : 3520,
-     "referenced_type" : "type-259"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDxE"
     },
     {
      "field_name" : "SetFloatField",
      "field_offset" : 3552,
-     "referenced_type" : "type-261"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDfE"
     },
     {
      "field_name" : "SetDoubleField",
      "field_offset" : 3584,
-     "referenced_type" : "type-263"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDdE"
     },
     {
      "field_name" : "GetStaticMethodID",
      "field_offset" : 3616,
-     "referenced_type" : "type-85"
+     "referenced_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E"
     },
     {
      "field_name" : "CallStaticObjectMethod",
      "field_offset" : 3648,
-     "referenced_type" : "type-66"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticObjectMethodV",
      "field_offset" : 3680,
-     "referenced_type" : "type-68"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticObjectMethodA",
      "field_offset" : 3712,
-     "referenced_type" : "type-71"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticBooleanMethod",
      "field_offset" : 3744,
-     "referenced_type" : "type-265"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticBooleanMethodV",
      "field_offset" : 3776,
-     "referenced_type" : "type-267"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticBooleanMethodA",
      "field_offset" : 3808,
-     "referenced_type" : "type-270"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticByteMethod",
      "field_offset" : 3840,
-     "referenced_type" : "type-272"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticByteMethodV",
      "field_offset" : 3872,
-     "referenced_type" : "type-274"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticByteMethodA",
      "field_offset" : 3904,
-     "referenced_type" : "type-277"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticCharMethod",
      "field_offset" : 3936,
-     "referenced_type" : "type-279"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticCharMethodV",
      "field_offset" : 3968,
-     "referenced_type" : "type-281"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticCharMethodA",
      "field_offset" : 4000,
-     "referenced_type" : "type-284"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticShortMethod",
      "field_offset" : 4032,
-     "referenced_type" : "type-286"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticShortMethodV",
      "field_offset" : 4064,
-     "referenced_type" : "type-288"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticShortMethodA",
      "field_offset" : 4096,
-     "referenced_type" : "type-291"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticIntMethod",
      "field_offset" : 4128,
-     "referenced_type" : "type-293"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticIntMethodV",
      "field_offset" : 4160,
-     "referenced_type" : "type-295"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticIntMethodA",
      "field_offset" : 4192,
-     "referenced_type" : "type-298"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticLongMethod",
      "field_offset" : 4224,
-     "referenced_type" : "type-300"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticLongMethodV",
      "field_offset" : 4256,
-     "referenced_type" : "type-302"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticLongMethodA",
      "field_offset" : 4288,
-     "referenced_type" : "type-305"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticFloatMethod",
      "field_offset" : 4320,
-     "referenced_type" : "type-307"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticFloatMethodV",
      "field_offset" : 4352,
-     "referenced_type" : "type-309"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticFloatMethodA",
      "field_offset" : 4384,
-     "referenced_type" : "type-312"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticDoubleMethod",
      "field_offset" : 4416,
-     "referenced_type" : "type-314"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticDoubleMethodV",
      "field_offset" : 4448,
-     "referenced_type" : "type-316"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticDoubleMethodA",
      "field_offset" : 4480,
-     "referenced_type" : "type-319"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticVoidMethod",
      "field_offset" : 4512,
-     "referenced_type" : "type-321"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticVoidMethodV",
      "field_offset" : 4544,
-     "referenced_type" : "type-323"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticVoidMethodA",
      "field_offset" : 4576,
-     "referenced_type" : "type-326"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "GetStaticFieldID",
      "field_offset" : 4608,
-     "referenced_type" : "type-227"
+     "referenced_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E"
     },
     {
      "field_name" : "GetStaticObjectField",
      "field_offset" : 4640,
-     "referenced_type" : "type-328"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticBooleanField",
      "field_offset" : 4672,
-     "referenced_type" : "type-330"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticByteField",
      "field_offset" : 4704,
-     "referenced_type" : "type-332"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticCharField",
      "field_offset" : 4736,
-     "referenced_type" : "type-334"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticShortField",
      "field_offset" : 4768,
-     "referenced_type" : "type-336"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticIntField",
      "field_offset" : 4800,
-     "referenced_type" : "type-338"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticLongField",
      "field_offset" : 4832,
-     "referenced_type" : "type-340"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticFloatField",
      "field_offset" : 4864,
-     "referenced_type" : "type-342"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticDoubleField",
      "field_offset" : 4896,
-     "referenced_type" : "type-344"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "SetStaticObjectField",
      "field_offset" : 4928,
-     "referenced_type" : "type-346"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE"
     },
     {
      "field_name" : "SetStaticBooleanField",
      "field_offset" : 4960,
-     "referenced_type" : "type-348"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDhE"
     },
     {
      "field_name" : "SetStaticByteField",
      "field_offset" : 4992,
-     "referenced_type" : "type-350"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDaE"
     },
     {
      "field_name" : "SetStaticCharField",
      "field_offset" : 5024,
-     "referenced_type" : "type-352"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDtE"
     },
     {
      "field_name" : "SetStaticShortField",
      "field_offset" : 5056,
-     "referenced_type" : "type-354"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDsE"
     },
     {
      "field_name" : "SetStaticIntField",
      "field_offset" : 5088,
-     "referenced_type" : "type-356"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDiE"
     },
     {
      "field_name" : "SetStaticLongField",
      "field_offset" : 5120,
-     "referenced_type" : "type-358"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDxE"
     },
     {
      "field_name" : "SetStaticFloatField",
      "field_offset" : 5152,
-     "referenced_type" : "type-360"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDfE"
     },
     {
      "field_name" : "SetStaticDoubleField",
      "field_offset" : 5184,
-     "referenced_type" : "type-362"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDdE"
     },
     {
      "field_name" : "NewString",
      "field_offset" : 5216,
-     "referenced_type" : "type-364"
+     "referenced_type" : "_ZTIPFP8_jstringP7_JNIEnvPKtiE"
     },
     {
      "field_name" : "GetStringLength",
      "field_offset" : 5248,
-     "referenced_type" : "type-370"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jstringE"
     },
     {
      "field_name" : "GetStringChars",
      "field_offset" : 5280,
-     "referenced_type" : "type-372"
+     "referenced_type" : "_ZTIPFPKtP7_JNIEnvP8_jstringPhE"
     },
     {
      "field_name" : "ReleaseStringChars",
      "field_offset" : 5312,
-     "referenced_type" : "type-375"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKtE"
     },
     {
      "field_name" : "NewStringUTF",
      "field_offset" : 5344,
-     "referenced_type" : "type-377"
+     "referenced_type" : "_ZTIPFP8_jstringP7_JNIEnvPKcE"
     },
     {
      "field_name" : "GetStringUTFLength",
      "field_offset" : 5376,
-     "referenced_type" : "type-370"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jstringE"
     },
     {
      "field_name" : "GetStringUTFChars",
      "field_offset" : 5408,
-     "referenced_type" : "type-379"
+     "referenced_type" : "_ZTIPFPKcP7_JNIEnvP8_jstringPhE"
     },
     {
      "field_name" : "ReleaseStringUTFChars",
      "field_offset" : 5440,
-     "referenced_type" : "type-381"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKcE"
     },
     {
      "field_name" : "GetArrayLength",
      "field_offset" : 5472,
-     "referenced_type" : "type-383"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jarrayE"
     },
     {
      "field_name" : "NewObjectArray",
      "field_offset" : 5504,
-     "referenced_type" : "type-387"
+     "referenced_type" : "_ZTIPFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE"
     },
     {
      "field_name" : "GetObjectArrayElement",
      "field_offset" : 5536,
-     "referenced_type" : "type-391"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP13_jobjectArrayiE"
     },
     {
      "field_name" : "SetObjectArrayElement",
      "field_offset" : 5568,
-     "referenced_type" : "type-393"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE"
     },
     {
      "field_name" : "NewBooleanArray",
      "field_offset" : 5600,
-     "referenced_type" : "type-395"
+     "referenced_type" : "_ZTIPFP14_jbooleanArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewByteArray",
      "field_offset" : 5632,
-     "referenced_type" : "type-399"
+     "referenced_type" : "_ZTIPFP11_jbyteArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewCharArray",
      "field_offset" : 5664,
-     "referenced_type" : "type-403"
+     "referenced_type" : "_ZTIPFP11_jcharArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewShortArray",
      "field_offset" : 5696,
-     "referenced_type" : "type-407"
+     "referenced_type" : "_ZTIPFP12_jshortArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewIntArray",
      "field_offset" : 5728,
-     "referenced_type" : "type-411"
+     "referenced_type" : "_ZTIPFP10_jintArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewLongArray",
      "field_offset" : 5760,
-     "referenced_type" : "type-415"
+     "referenced_type" : "_ZTIPFP11_jlongArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewFloatArray",
      "field_offset" : 5792,
-     "referenced_type" : "type-419"
+     "referenced_type" : "_ZTIPFP12_jfloatArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewDoubleArray",
      "field_offset" : 5824,
-     "referenced_type" : "type-423"
+     "referenced_type" : "_ZTIPFP13_jdoubleArrayP7_JNIEnviE"
     },
     {
      "field_name" : "GetBooleanArrayElements",
      "field_offset" : 5856,
-     "referenced_type" : "type-427"
+     "referenced_type" : "_ZTIPFPhP7_JNIEnvP14_jbooleanArrayS_E"
     },
     {
      "field_name" : "GetByteArrayElements",
      "field_offset" : 5888,
-     "referenced_type" : "type-429"
+     "referenced_type" : "_ZTIPFPaP7_JNIEnvP11_jbyteArrayPhE"
     },
     {
      "field_name" : "GetCharArrayElements",
      "field_offset" : 5920,
-     "referenced_type" : "type-432"
+     "referenced_type" : "_ZTIPFPtP7_JNIEnvP11_jcharArrayPhE"
     },
     {
      "field_name" : "GetShortArrayElements",
      "field_offset" : 5952,
-     "referenced_type" : "type-435"
+     "referenced_type" : "_ZTIPFPsP7_JNIEnvP12_jshortArrayPhE"
     },
     {
      "field_name" : "GetIntArrayElements",
      "field_offset" : 5984,
-     "referenced_type" : "type-438"
+     "referenced_type" : "_ZTIPFPiP7_JNIEnvP10_jintArrayPhE"
     },
     {
      "field_name" : "GetLongArrayElements",
      "field_offset" : 6016,
-     "referenced_type" : "type-441"
+     "referenced_type" : "_ZTIPFPxP7_JNIEnvP11_jlongArrayPhE"
     },
     {
      "field_name" : "GetFloatArrayElements",
      "field_offset" : 6048,
-     "referenced_type" : "type-444"
+     "referenced_type" : "_ZTIPFPfP7_JNIEnvP12_jfloatArrayPhE"
     },
     {
      "field_name" : "GetDoubleArrayElements",
      "field_offset" : 6080,
-     "referenced_type" : "type-447"
+     "referenced_type" : "_ZTIPFPdP7_JNIEnvP13_jdoubleArrayPhE"
     },
     {
      "field_name" : "ReleaseBooleanArrayElements",
      "field_offset" : 6112,
-     "referenced_type" : "type-450"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayPhiE"
     },
     {
      "field_name" : "ReleaseByteArrayElements",
      "field_offset" : 6144,
-     "referenced_type" : "type-452"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayPaiE"
     },
     {
      "field_name" : "ReleaseCharArrayElements",
      "field_offset" : 6176,
-     "referenced_type" : "type-454"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayPtiE"
     },
     {
      "field_name" : "ReleaseShortArrayElements",
      "field_offset" : 6208,
-     "referenced_type" : "type-456"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayPsiE"
     },
     {
      "field_name" : "ReleaseIntArrayElements",
      "field_offset" : 6240,
-     "referenced_type" : "type-458"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayPiiE"
     },
     {
      "field_name" : "ReleaseLongArrayElements",
      "field_offset" : 6272,
-     "referenced_type" : "type-460"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayPxiE"
     },
     {
      "field_name" : "ReleaseFloatArrayElements",
      "field_offset" : 6304,
-     "referenced_type" : "type-462"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayPfiE"
     },
     {
      "field_name" : "ReleaseDoubleArrayElements",
      "field_offset" : 6336,
-     "referenced_type" : "type-464"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayPdiE"
     },
     {
      "field_name" : "GetBooleanArrayRegion",
      "field_offset" : 6368,
-     "referenced_type" : "type-466"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPhE"
     },
     {
      "field_name" : "GetByteArrayRegion",
      "field_offset" : 6400,
-     "referenced_type" : "type-468"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPaE"
     },
     {
      "field_name" : "GetCharArrayRegion",
      "field_offset" : 6432,
-     "referenced_type" : "type-470"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPtE"
     },
     {
      "field_name" : "GetShortArrayRegion",
      "field_offset" : 6464,
-     "referenced_type" : "type-472"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPsE"
     },
     {
      "field_name" : "GetIntArrayRegion",
      "field_offset" : 6496,
-     "referenced_type" : "type-474"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPiE"
     },
     {
      "field_name" : "GetLongArrayRegion",
      "field_offset" : 6528,
-     "referenced_type" : "type-476"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPxE"
     },
     {
      "field_name" : "GetFloatArrayRegion",
      "field_offset" : 6560,
-     "referenced_type" : "type-478"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPfE"
     },
     {
      "field_name" : "GetDoubleArrayRegion",
      "field_offset" : 6592,
-     "referenced_type" : "type-480"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPdE"
     },
     {
      "field_name" : "SetBooleanArrayRegion",
      "field_offset" : 6624,
-     "referenced_type" : "type-482"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPKhE"
     },
     {
      "field_name" : "SetByteArrayRegion",
      "field_offset" : 6656,
-     "referenced_type" : "type-486"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPKaE"
     },
     {
      "field_name" : "SetCharArrayRegion",
      "field_offset" : 6688,
-     "referenced_type" : "type-488"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPKtE"
     },
     {
      "field_name" : "SetShortArrayRegion",
      "field_offset" : 6720,
-     "referenced_type" : "type-490"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPKsE"
     },
     {
      "field_name" : "SetIntArrayRegion",
      "field_offset" : 6752,
-     "referenced_type" : "type-494"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPKiE"
     },
     {
      "field_name" : "SetLongArrayRegion",
      "field_offset" : 6784,
-     "referenced_type" : "type-498"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPKxE"
     },
     {
      "field_name" : "SetFloatArrayRegion",
      "field_offset" : 6816,
-     "referenced_type" : "type-502"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPKfE"
     },
     {
      "field_name" : "SetDoubleArrayRegion",
      "field_offset" : 6848,
-     "referenced_type" : "type-506"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPKdE"
     },
     {
      "field_name" : "RegisterNatives",
      "field_offset" : 6880,
-     "referenced_type" : "type-510"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE"
     },
     {
      "field_name" : "UnregisterNatives",
      "field_offset" : 6912,
-     "referenced_type" : "type-515"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassE"
     },
     {
      "field_name" : "MonitorEnter",
      "field_offset" : 6944,
-     "referenced_type" : "type-517"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "MonitorExit",
      "field_offset" : 6976,
-     "referenced_type" : "type-517"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "GetJavaVM",
      "field_offset" : 7008,
-     "referenced_type" : "type-519"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvPP7_JavaVME"
     },
     {
      "field_name" : "GetStringRegion",
      "field_offset" : 7040,
-     "referenced_type" : "type-535"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringiiPtE"
     },
     {
      "field_name" : "GetStringUTFRegion",
      "field_offset" : 7072,
-     "referenced_type" : "type-537"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringiiPcE"
     },
     {
      "field_name" : "GetPrimitiveArrayCritical",
      "field_offset" : 7104,
-     "referenced_type" : "type-540"
+     "referenced_type" : "_ZTIPFPvP7_JNIEnvP7_jarrayPhE"
     },
     {
      "field_name" : "ReleasePrimitiveArrayCritical",
      "field_offset" : 7136,
-     "referenced_type" : "type-542"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jarrayPviE"
     },
     {
      "field_name" : "GetStringCritical",
      "field_offset" : 7168,
-     "referenced_type" : "type-372"
+     "referenced_type" : "_ZTIPFPKtP7_JNIEnvP8_jstringPhE"
     },
     {
      "field_name" : "ReleaseStringCritical",
      "field_offset" : 7200,
-     "referenced_type" : "type-375"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKtE"
     },
     {
      "field_name" : "NewWeakGlobalRef",
      "field_offset" : 7232,
-     "referenced_type" : "type-60"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E"
     },
     {
      "field_name" : "DeleteWeakGlobalRef",
      "field_offset" : 7264,
-     "referenced_type" : "type-62"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "ExceptionCheck",
      "field_offset" : 7296,
-     "referenced_type" : "type-544"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvE"
     },
     {
      "field_name" : "NewDirectByteBuffer",
      "field_offset" : 7328,
-     "referenced_type" : "type-546"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvPvxE"
     },
     {
      "field_name" : "GetDirectBufferAddress",
      "field_offset" : 7360,
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIPFPvP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "GetDirectBufferCapacity",
      "field_offset" : 7392,
-     "referenced_type" : "type-550"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "GetObjectRefType",
      "field_offset" : 7424,
-     "referenced_type" : "type-552"
+     "referenced_type" : "_ZTIPF14jobjectRefTypeP7_JNIEnvP8_jobjectE"
     }
    ],
    "linker_set_key" : "_ZTI18JNINativeInterface",
    "name" : "JNINativeInterface",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "_ZTI18JNINativeInterface",
+   "self_type" : "_ZTI18JNINativeInterface",
    "size" : 932,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12220,46 +11933,46 @@
    [
     {
      "field_name" : "z",
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     },
     {
      "field_name" : "b",
-     "referenced_type" : "type-26"
+     "referenced_type" : "_ZTIa"
     },
     {
      "field_name" : "c",
-     "referenced_type" : "type-76"
+     "referenced_type" : "_ZTIt"
     },
     {
      "field_name" : "s",
-     "referenced_type" : "type-77"
+     "referenced_type" : "_ZTIs"
     },
     {
      "field_name" : "i",
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "j",
-     "referenced_type" : "type-78"
+     "referenced_type" : "_ZTIx"
     },
     {
      "field_name" : "f",
-     "referenced_type" : "type-79"
+     "referenced_type" : "_ZTIf"
     },
     {
      "field_name" : "d",
-     "referenced_type" : "type-80"
+     "referenced_type" : "_ZTId"
     },
     {
      "field_name" : "l",
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI6jvalue",
    "name" : "jvalue",
    "record_kind" : "union",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "_ZTI6jvalue",
+   "self_type" : "_ZTI6jvalue",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12269,13 +11982,13 @@
    [
     {
      "field_name" : "functions",
-     "referenced_type" : "type-9"
+     "referenced_type" : "_ZTIPK18JNINativeInterface"
     }
    ],
    "linker_set_key" : "_ZTI7_JNIEnv",
    "name" : "_JNIEnv",
-   "referenced_type" : "type-8",
-   "self_type" : "type-8",
+   "referenced_type" : "_ZTI7_JNIEnv",
+   "self_type" : "_ZTI7_JNIEnv",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12285,13 +11998,13 @@
    [
     {
      "field_name" : "functions",
-     "referenced_type" : "type-524"
+     "referenced_type" : "_ZTIPK18JNIInvokeInterface"
     }
    ],
    "linker_set_key" : "_ZTI7_JavaVM",
    "name" : "_JavaVM",
-   "referenced_type" : "type-523",
-   "self_type" : "type-523",
+   "referenced_type" : "_ZTI7_JavaVM",
+   "self_type" : "_ZTI7_JavaVM",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12300,14 +12013,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTI8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI7_jarray",
    "name" : "_jarray",
    "record_kind" : "class",
-   "referenced_type" : "type-386",
-   "self_type" : "type-386",
+   "referenced_type" : "_ZTI7_jarray",
+   "self_type" : "_ZTI7_jarray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12316,14 +12029,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTI8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI7_jclass",
    "name" : "_jclass",
    "record_kind" : "class",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "_ZTI7_jclass",
+   "self_type" : "_ZTI7_jclass",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12332,8 +12045,8 @@
    "linker_set_key" : "_ZTI8_jobject",
    "name" : "_jobject",
    "record_kind" : "class",
-   "referenced_type" : "type-6",
-   "self_type" : "type-6",
+   "referenced_type" : "_ZTI8_jobject",
+   "self_type" : "_ZTI8_jobject",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12342,14 +12055,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTI8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI8_jstring",
    "name" : "_jstring",
    "record_kind" : "class",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
+   "referenced_type" : "_ZTI8_jstring",
+   "self_type" : "_ZTI8_jstring",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   }
diff --git a/R/64/arm_armv8-a/source-based/libbinder_ndk.so.lsdump b/R/64/arm_armv8-a/source-based/libbinder_ndk.so.lsdump
index 52e4767..ea3c0a8 100644
--- a/R/64/arm_armv8-a/source-based/libbinder_ndk.so.lsdump
+++ b/R/64/arm_armv8-a/source-based/libbinder_ndk.so.lsdump
@@ -8,8 +8,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIDs",
    "name" : "char16_t",
-   "referenced_type" : "type-646",
-   "self_type" : "type-646",
+   "referenced_type" : "_ZTIDs",
+   "self_type" : "_ZTIDs",
    "size" : 2
   },
   {
@@ -17,8 +17,8 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIa",
    "name" : "signed char",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
+   "referenced_type" : "_ZTIa",
+   "self_type" : "_ZTIa",
    "size" : 1
   },
   {
@@ -27,8 +27,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIb",
    "name" : "bool",
-   "referenced_type" : "type-599",
-   "self_type" : "type-599",
+   "referenced_type" : "_ZTIb",
+   "self_type" : "_ZTIb",
    "size" : 1
   },
   {
@@ -37,32 +37,32 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIc",
    "name" : "char",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIc",
    "size" : 1
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTId",
    "name" : "double",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
+   "referenced_type" : "_ZTId",
+   "self_type" : "_ZTId",
    "size" : 8
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIe",
    "name" : "long double",
-   "referenced_type" : "type-582",
-   "self_type" : "type-582",
+   "referenced_type" : "_ZTIe",
+   "self_type" : "_ZTIe",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIf",
    "name" : "float",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
+   "referenced_type" : "_ZTIf",
+   "self_type" : "_ZTIf",
    "size" : 4
   },
   {
@@ -71,8 +71,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIh",
    "name" : "unsigned char",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIh",
    "size" : 1
   },
   {
@@ -80,8 +80,8 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIi",
    "name" : "int",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
+   "referenced_type" : "_ZTIi",
+   "self_type" : "_ZTIi",
    "size" : 4
   },
   {
@@ -90,8 +90,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIj",
    "name" : "unsigned int",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
+   "referenced_type" : "_ZTIj",
+   "self_type" : "_ZTIj",
    "size" : 4
   },
   {
@@ -99,8 +99,8 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIl",
    "name" : "long",
-   "referenced_type" : "type-583",
-   "self_type" : "type-583",
+   "referenced_type" : "_ZTIl",
+   "self_type" : "_ZTIl",
    "size" : 4
   },
   {
@@ -109,8 +109,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIm",
    "name" : "unsigned long",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
+   "referenced_type" : "_ZTIm",
+   "self_type" : "_ZTIm",
    "size" : 4
   },
   {
@@ -118,8 +118,8 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIs",
    "name" : "short",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "_ZTIs",
+   "self_type" : "_ZTIs",
    "size" : 2
   },
   {
@@ -128,23 +128,23 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIt",
    "name" : "unsigned short",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "_ZTIt",
+   "self_type" : "_ZTIt",
    "size" : 2
   },
   {
    "linker_set_key" : "_ZTIv",
    "name" : "void",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13"
+   "referenced_type" : "_ZTIv",
+   "self_type" : "_ZTIv"
   },
   {
    "alignment" : 8,
    "is_integral" : true,
    "linker_set_key" : "_ZTIx",
    "name" : "long long",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
+   "referenced_type" : "_ZTIx",
+   "self_type" : "_ZTIx",
    "size" : 8
   },
   {
@@ -153,8 +153,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIy",
    "name" : "unsigned long long",
-   "referenced_type" : "type-645",
-   "self_type" : "type-645",
+   "referenced_type" : "_ZTIy",
+   "self_type" : "_ZTIy",
    "size" : 8
   }
  ],
@@ -494,11 +494,11 @@
    ],
    "linker_set_key" : "_ZTI14jobjectRefType",
    "name" : "jobjectRefType",
-   "referenced_type" : "type-554",
-   "self_type" : "type-554",
+   "referenced_type" : "_ZTI14jobjectRefType",
+   "self_type" : "_ZTI14jobjectRefType",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h",
-   "underlying_type" : "type-555"
+   "underlying_type" : "_ZTIj"
   }
  ],
  "function_types" :
@@ -510,15 +510,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-553",
-   "return_type" : "type-554",
-   "self_type" : "type-553",
+   "referenced_type" : "_ZTIF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTI14jobjectRefType",
+   "self_type" : "_ZTIF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -528,15 +528,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-412",
-   "return_type" : "type-413",
-   "self_type" : "type-412",
+   "referenced_type" : "_ZTIFP10_jintArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP10_jintArray",
+   "self_type" : "_ZTIFP10_jintArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -546,21 +546,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-86",
-   "return_type" : "type-31",
-   "self_type" : "type-86",
+   "referenced_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
+   "return_type" : "_ZTIP10_jmethodID",
+   "self_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -570,15 +570,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-30",
-   "return_type" : "type-31",
-   "self_type" : "type-30",
+   "referenced_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIP10_jmethodID",
+   "self_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -588,15 +588,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-400",
-   "return_type" : "type-401",
-   "self_type" : "type-400",
+   "referenced_type" : "_ZTIFP11_jbyteArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP11_jbyteArray",
+   "self_type" : "_ZTIFP11_jbyteArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -606,15 +606,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-404",
-   "return_type" : "type-405",
-   "self_type" : "type-404",
+   "referenced_type" : "_ZTIFP11_jcharArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP11_jcharArray",
+   "self_type" : "_ZTIFP11_jcharArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -624,15 +624,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-416",
-   "return_type" : "type-417",
-   "self_type" : "type-416",
+   "referenced_type" : "_ZTIFP11_jlongArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP11_jlongArray",
+   "self_type" : "_ZTIFP11_jlongArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -642,12 +642,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     }
    ],
-   "referenced_type" : "type-53",
-   "return_type" : "type-48",
-   "self_type" : "type-53",
+   "referenced_type" : "_ZTIFP11_jthrowableP7_JNIEnvE",
+   "return_type" : "_ZTIP11_jthrowable",
+   "self_type" : "_ZTIFP11_jthrowableP7_JNIEnvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -657,15 +657,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-420",
-   "return_type" : "type-421",
-   "self_type" : "type-420",
+   "referenced_type" : "_ZTIFP12_jfloatArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP12_jfloatArray",
+   "self_type" : "_ZTIFP12_jfloatArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -675,15 +675,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-408",
-   "return_type" : "type-409",
-   "self_type" : "type-408",
+   "referenced_type" : "_ZTIFP12_jshortArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP12_jshortArray",
+   "self_type" : "_ZTIFP12_jshortArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -693,15 +693,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-424",
-   "return_type" : "type-425",
-   "self_type" : "type-424",
+   "referenced_type" : "_ZTIFP13_jdoubleArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP13_jdoubleArray",
+   "self_type" : "_ZTIFP13_jdoubleArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -711,21 +711,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-388",
-   "return_type" : "type-389",
-   "self_type" : "type-388",
+   "referenced_type" : "_ZTIFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
+   "return_type" : "_ZTIP13_jobjectArray",
+   "self_type" : "_ZTIFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -735,15 +735,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-396",
-   "return_type" : "type-397",
-   "self_type" : "type-396",
+   "referenced_type" : "_ZTIFP14_jbooleanArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP14_jbooleanArray",
+   "self_type" : "_ZTIFP14_jbooleanArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -753,15 +753,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-82",
-   "return_type" : "type-19",
-   "self_type" : "type-82",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIP7_jclass",
+   "self_type" : "_ZTIFP7_jclassP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -771,15 +771,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-28",
-   "return_type" : "type-19",
-   "self_type" : "type-28",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvPKcE",
+   "return_type" : "_ZTIP7_jclass",
+   "self_type" : "_ZTIFP7_jclassP7_JNIEnvPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -789,24 +789,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "_ZTIPKa"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-18",
-   "return_type" : "type-19",
-   "self_type" : "type-18",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
+   "return_type" : "_ZTIP7_jclass",
+   "self_type" : "_ZTIFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -816,15 +816,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-41",
-   "return_type" : "type-19",
-   "self_type" : "type-41",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvS0_E",
+   "return_type" : "_ZTIP7_jclass",
+   "self_type" : "_ZTIFP7_jclassP7_JNIEnvS0_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -834,18 +834,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-389"
+     "referenced_type" : "_ZTIP13_jobjectArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-392",
-   "return_type" : "type-5",
-   "self_type" : "type-392",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -855,15 +855,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-4",
-   "return_type" : "type-5",
-   "self_type" : "type-4",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -873,21 +873,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-72",
-   "return_type" : "type-5",
-   "self_type" : "type-72",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -897,21 +897,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-69",
-   "return_type" : "type-5",
-   "self_type" : "type-69",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -921,21 +921,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     }
    ],
-   "referenced_type" : "type-38",
-   "return_type" : "type-5",
-   "self_type" : "type-38",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -945,18 +945,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-67",
-   "return_type" : "type-5",
-   "self_type" : "type-67",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -966,18 +966,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-329",
-   "return_type" : "type-5",
-   "self_type" : "type-329",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -987,21 +987,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     }
    ],
-   "referenced_type" : "type-45",
-   "return_type" : "type-5",
-   "self_type" : "type-45",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1011,18 +1011,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "_ZTIx"
     }
    ],
-   "referenced_type" : "type-547",
-   "return_type" : "type-5",
-   "self_type" : "type-547",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvPvxE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvPvxE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1032,15 +1032,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-61",
-   "return_type" : "type-5",
-   "self_type" : "type-61",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_E",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1050,21 +1050,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-93",
-   "return_type" : "type-5",
-   "self_type" : "type-93",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1074,21 +1074,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-91"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-90",
-   "return_type" : "type-5",
-   "self_type" : "type-90",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1098,18 +1098,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-88",
-   "return_type" : "type-5",
-   "self_type" : "type-88",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1119,24 +1119,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-163",
-   "return_type" : "type-5",
-   "self_type" : "type-163",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1146,24 +1146,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-161"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-160",
-   "return_type" : "type-5",
-   "self_type" : "type-160",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1173,21 +1173,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-158",
-   "return_type" : "type-5",
-   "self_type" : "type-158",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1197,18 +1197,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-230",
-   "return_type" : "type-5",
-   "self_type" : "type-230",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1218,15 +1218,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-378",
-   "return_type" : "type-366",
-   "self_type" : "type-378",
+   "referenced_type" : "_ZTIFP8_jstringP7_JNIEnvPKcE",
+   "return_type" : "_ZTIP8_jstring",
+   "self_type" : "_ZTIFP8_jstringP7_JNIEnvPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1236,18 +1236,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "_ZTIPKt"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-365",
-   "return_type" : "type-366",
-   "self_type" : "type-365",
+   "referenced_type" : "_ZTIFP8_jstringP7_JNIEnvPKtiE",
+   "return_type" : "_ZTIP8_jstring",
+   "self_type" : "_ZTIFP8_jstringP7_JNIEnvPKtiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1257,21 +1257,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-228",
-   "return_type" : "type-35",
-   "self_type" : "type-228",
+   "referenced_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
+   "return_type" : "_ZTIP9_jfieldID",
+   "self_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1281,15 +1281,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-34",
-   "return_type" : "type-35",
-   "self_type" : "type-34",
+   "referenced_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIP9_jfieldID",
+   "self_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1299,18 +1299,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-366"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-380",
-   "return_type" : "type-21",
-   "self_type" : "type-380",
+   "referenced_type" : "_ZTIFPKcP7_JNIEnvP8_jstringPhE",
+   "return_type" : "_ZTIPKc",
+   "self_type" : "_ZTIFPKcP7_JNIEnvP8_jstringPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1320,18 +1320,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "_ZTIPi"
     }
    ],
-   "referenced_type" : "type-630",
-   "return_type" : "type-21",
-   "self_type" : "type-630",
+   "referenced_type" : "_ZTIFPKcPKvjPiE",
+   "return_type" : "_ZTIPKc",
+   "self_type" : "_ZTIFPKcPKvjPiE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1341,18 +1341,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-366"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-373",
-   "return_type" : "type-368",
-   "self_type" : "type-373",
+   "referenced_type" : "_ZTIFPKtP7_JNIEnvP8_jstringPhE",
+   "return_type" : "_ZTIPKt",
+   "self_type" : "_ZTIFPKtP7_JNIEnvP8_jstringPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1362,18 +1362,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-401"
+     "referenced_type" : "_ZTIP11_jbyteArray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-430",
-   "return_type" : "type-431",
-   "self_type" : "type-430",
+   "referenced_type" : "_ZTIFPaP7_JNIEnvP11_jbyteArrayPhE",
+   "return_type" : "_ZTIPa",
+   "self_type" : "_ZTIFPaP7_JNIEnvP11_jbyteArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1383,18 +1383,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-425"
+     "referenced_type" : "_ZTIP13_jdoubleArray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-448",
-   "return_type" : "type-449",
-   "self_type" : "type-448",
+   "referenced_type" : "_ZTIFPdP7_JNIEnvP13_jdoubleArrayPhE",
+   "return_type" : "_ZTIPd",
+   "self_type" : "_ZTIFPdP7_JNIEnvP13_jdoubleArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1404,18 +1404,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-421"
+     "referenced_type" : "_ZTIP12_jfloatArray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-445",
-   "return_type" : "type-446",
-   "self_type" : "type-445",
+   "referenced_type" : "_ZTIFPfP7_JNIEnvP12_jfloatArrayPhE",
+   "return_type" : "_ZTIPf",
+   "self_type" : "_ZTIFPfP7_JNIEnvP12_jfloatArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1425,18 +1425,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "_ZTIP14_jbooleanArray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-428",
-   "return_type" : "type-374",
-   "self_type" : "type-428",
+   "referenced_type" : "_ZTIFPhP7_JNIEnvP14_jbooleanArrayS_E",
+   "return_type" : "_ZTIPh",
+   "self_type" : "_ZTIFPhP7_JNIEnvP14_jbooleanArrayS_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1446,18 +1446,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "_ZTIP10_jintArray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-439",
-   "return_type" : "type-440",
-   "self_type" : "type-439",
+   "referenced_type" : "_ZTIFPiP7_JNIEnvP10_jintArrayPhE",
+   "return_type" : "_ZTIPi",
+   "self_type" : "_ZTIFPiP7_JNIEnvP10_jintArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1467,18 +1467,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-409"
+     "referenced_type" : "_ZTIP12_jshortArray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-436",
-   "return_type" : "type-437",
-   "self_type" : "type-436",
+   "referenced_type" : "_ZTIFPsP7_JNIEnvP12_jshortArrayPhE",
+   "return_type" : "_ZTIPs",
+   "self_type" : "_ZTIFPsP7_JNIEnvP12_jshortArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1488,18 +1488,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "_ZTIP11_jcharArray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-433",
-   "return_type" : "type-434",
-   "self_type" : "type-433",
+   "referenced_type" : "_ZTIFPtP7_JNIEnvP11_jcharArrayPhE",
+   "return_type" : "_ZTIPt",
+   "self_type" : "_ZTIFPtP7_JNIEnvP11_jcharArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1509,18 +1509,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "_ZTIP7_jarray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-541",
-   "return_type" : "type-12",
-   "self_type" : "type-541",
+   "referenced_type" : "_ZTIFPvP7_JNIEnvP7_jarrayPhE",
+   "return_type" : "_ZTIPv",
+   "self_type" : "_ZTIFPvP7_JNIEnvP7_jarrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1530,15 +1530,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-549",
-   "return_type" : "type-12",
-   "self_type" : "type-549",
+   "referenced_type" : "_ZTIFPvP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIPv",
+   "self_type" : "_ZTIFPvP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1548,12 +1548,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "referenced_type" : "type-610",
-   "return_type" : "type-12",
-   "self_type" : "type-610",
+   "referenced_type" : "_ZTIFPvS_E",
+   "return_type" : "_ZTIPv",
+   "self_type" : "_ZTIFPvS_E",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -1563,18 +1563,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-417"
+     "referenced_type" : "_ZTIP11_jlongArray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-442",
-   "return_type" : "type-443",
-   "self_type" : "type-442",
+   "referenced_type" : "_ZTIFPxP7_JNIEnvP11_jlongArrayPhE",
+   "return_type" : "_ZTIPx",
+   "self_type" : "_ZTIFPxP7_JNIEnvP11_jlongArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1584,21 +1584,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-278",
-   "return_type" : "type-26",
-   "self_type" : "type-278",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1608,21 +1608,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-276"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-275",
-   "return_type" : "type-26",
-   "self_type" : "type-275",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1632,18 +1632,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-273",
-   "return_type" : "type-26",
-   "self_type" : "type-273",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1653,18 +1653,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-333",
-   "return_type" : "type-26",
-   "self_type" : "type-333",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1674,21 +1674,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-107",
-   "return_type" : "type-26",
-   "self_type" : "type-107",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1698,21 +1698,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-104",
-   "return_type" : "type-26",
-   "self_type" : "type-104",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1722,18 +1722,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-102",
-   "return_type" : "type-26",
-   "self_type" : "type-102",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1743,24 +1743,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-177",
-   "return_type" : "type-26",
-   "self_type" : "type-177",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1770,24 +1770,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-175"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-174",
-   "return_type" : "type-26",
-   "self_type" : "type-174",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1797,21 +1797,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-172",
-   "return_type" : "type-26",
-   "self_type" : "type-172",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1821,18 +1821,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-234",
-   "return_type" : "type-26",
-   "self_type" : "type-234",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1842,15 +1842,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "referenced_type" : "type-655",
-   "return_type" : "type-599",
-   "self_type" : "type-655",
+   "referenced_type" : "_ZTIFbPKvjE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPKvjE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1860,15 +1860,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-634",
-   "return_type" : "type-599",
-   "self_type" : "type-634",
+   "referenced_type" : "_ZTIFbPviE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1878,18 +1878,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-683"
+     "referenced_type" : "_ZTIPPDs"
     }
    ],
-   "referenced_type" : "type-682",
-   "return_type" : "type-599",
-   "self_type" : "type-682",
+   "referenced_type" : "_ZTIFbPviPPDsE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPDsE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1899,18 +1899,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-686"
+     "referenced_type" : "_ZTIPPa"
     }
    ],
-   "referenced_type" : "type-685",
-   "return_type" : "type-599",
-   "self_type" : "type-685",
+   "referenced_type" : "_ZTIFbPviPPaE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPaE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1920,18 +1920,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-626"
+     "referenced_type" : "_ZTIPPc"
     }
    ],
-   "referenced_type" : "type-625",
-   "return_type" : "type-599",
-   "self_type" : "type-625",
+   "referenced_type" : "_ZTIFbPviPPcE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPcE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1941,18 +1941,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-677"
+     "referenced_type" : "_ZTIPPd"
     }
    ],
-   "referenced_type" : "type-676",
-   "return_type" : "type-599",
-   "self_type" : "type-676",
+   "referenced_type" : "_ZTIFbPviPPdE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPdE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1962,18 +1962,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-674"
+     "referenced_type" : "_ZTIPPf"
     }
    ],
-   "referenced_type" : "type-673",
-   "return_type" : "type-599",
-   "self_type" : "type-673",
+   "referenced_type" : "_ZTIFbPviPPfE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPfE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1983,18 +1983,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-660"
+     "referenced_type" : "_ZTIPPi"
     }
    ],
-   "referenced_type" : "type-659",
-   "return_type" : "type-599",
-   "self_type" : "type-659",
+   "referenced_type" : "_ZTIFbPviPPiE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPiE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -2004,18 +2004,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-663"
+     "referenced_type" : "_ZTIPPj"
     }
    ],
-   "referenced_type" : "type-662",
-   "return_type" : "type-599",
-   "self_type" : "type-662",
+   "referenced_type" : "_ZTIFbPviPPjE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPjE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -2025,18 +2025,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-666"
+     "referenced_type" : "_ZTIPPx"
     }
    ],
-   "referenced_type" : "type-665",
-   "return_type" : "type-599",
-   "self_type" : "type-665",
+   "referenced_type" : "_ZTIFbPviPPxE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPxE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -2046,18 +2046,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-669"
+     "referenced_type" : "_ZTIPPy"
     }
    ],
-   "referenced_type" : "type-668",
-   "return_type" : "type-599",
-   "self_type" : "type-668",
+   "referenced_type" : "_ZTIFbPviPPyE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPyE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -2067,21 +2067,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-626"
+     "referenced_type" : "_ZTIPPc"
     }
    ],
-   "referenced_type" : "type-636",
-   "return_type" : "type-599",
-   "self_type" : "type-636",
+   "referenced_type" : "_ZTIFbPvjiPPcE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPvjiPPcE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -2091,21 +2091,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-320",
-   "return_type" : "type-80",
-   "self_type" : "type-320",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2115,21 +2115,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-318"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-317",
-   "return_type" : "type-80",
-   "self_type" : "type-317",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2139,18 +2139,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-315",
-   "return_type" : "type-80",
-   "self_type" : "type-315",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2160,18 +2160,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-345",
-   "return_type" : "type-80",
-   "self_type" : "type-345",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2181,21 +2181,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-149",
-   "return_type" : "type-80",
-   "self_type" : "type-149",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2205,21 +2205,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-146",
-   "return_type" : "type-80",
-   "self_type" : "type-146",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2229,18 +2229,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-144",
-   "return_type" : "type-80",
-   "self_type" : "type-144",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2250,24 +2250,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-219",
-   "return_type" : "type-80",
-   "self_type" : "type-219",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2277,24 +2277,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-216",
-   "return_type" : "type-80",
-   "self_type" : "type-216",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2304,21 +2304,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-214",
-   "return_type" : "type-80",
-   "self_type" : "type-214",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2328,18 +2328,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-246",
-   "return_type" : "type-80",
-   "self_type" : "type-246",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2349,21 +2349,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-313",
-   "return_type" : "type-79",
-   "self_type" : "type-313",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2373,21 +2373,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-311"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-310",
-   "return_type" : "type-79",
-   "self_type" : "type-310",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2397,18 +2397,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-308",
-   "return_type" : "type-79",
-   "self_type" : "type-308",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2418,18 +2418,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-343",
-   "return_type" : "type-79",
-   "self_type" : "type-343",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2439,21 +2439,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-142",
-   "return_type" : "type-79",
-   "self_type" : "type-142",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2463,21 +2463,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-139",
-   "return_type" : "type-79",
-   "self_type" : "type-139",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2487,18 +2487,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-137",
-   "return_type" : "type-79",
-   "self_type" : "type-137",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2508,24 +2508,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-212",
-   "return_type" : "type-79",
-   "self_type" : "type-212",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2535,24 +2535,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-210"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-209",
-   "return_type" : "type-79",
-   "self_type" : "type-209",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2562,21 +2562,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-207",
-   "return_type" : "type-79",
-   "self_type" : "type-207",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2586,18 +2586,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-244",
-   "return_type" : "type-79",
-   "self_type" : "type-244",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2607,12 +2607,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     }
    ],
-   "referenced_type" : "type-545",
-   "return_type" : "type-39",
-   "self_type" : "type-545",
+   "referenced_type" : "_ZTIFhP7_JNIEnvE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2622,21 +2622,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-271",
-   "return_type" : "type-39",
-   "self_type" : "type-271",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2646,21 +2646,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-269"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-268",
-   "return_type" : "type-39",
-   "self_type" : "type-268",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2670,18 +2670,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-266",
-   "return_type" : "type-39",
-   "self_type" : "type-266",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2691,18 +2691,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-331",
-   "return_type" : "type-39",
-   "self_type" : "type-331",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2712,18 +2712,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-43",
-   "return_type" : "type-39",
-   "self_type" : "type-43",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassS2_E",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassS2_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2733,21 +2733,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-100",
-   "return_type" : "type-39",
-   "self_type" : "type-100",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2757,21 +2757,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-98"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-97",
-   "return_type" : "type-39",
-   "self_type" : "type-97",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2781,18 +2781,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-95",
-   "return_type" : "type-39",
-   "self_type" : "type-95",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2802,18 +2802,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-84",
-   "return_type" : "type-39",
-   "self_type" : "type-84",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2823,24 +2823,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-170",
-   "return_type" : "type-39",
-   "self_type" : "type-170",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2850,24 +2850,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-168"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-167",
-   "return_type" : "type-39",
-   "self_type" : "type-167",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2877,21 +2877,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-165",
-   "return_type" : "type-39",
-   "self_type" : "type-165",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2901,18 +2901,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-232",
-   "return_type" : "type-39",
-   "self_type" : "type-232",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2922,18 +2922,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-65",
-   "return_type" : "type-39",
-   "self_type" : "type-65",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectS2_E",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectS2_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2943,18 +2943,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "referenced_type" : "type-638",
-   "return_type" : "type-16",
-   "self_type" : "type-638",
+   "referenced_type" : "_ZTIFiP7AParcelPKvjE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7AParcelPKvjE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -2964,12 +2964,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     }
    ],
-   "referenced_type" : "type-15",
-   "return_type" : "type-16",
-   "self_type" : "type-15",
+   "referenced_type" : "_ZTIFiP7_JNIEnvE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2979,15 +2979,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "_ZTIP11_jthrowable"
     }
    ],
-   "referenced_type" : "type-47",
-   "return_type" : "type-16",
-   "self_type" : "type-47",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP11_jthrowableE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP11_jthrowableE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2997,15 +2997,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "_ZTIP7_jarray"
     }
    ],
-   "referenced_type" : "type-384",
-   "return_type" : "type-16",
-   "self_type" : "type-384",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jarrayE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jarrayE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3015,15 +3015,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-516",
-   "return_type" : "type-16",
-   "self_type" : "type-516",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3033,21 +3033,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-299",
-   "return_type" : "type-16",
-   "self_type" : "type-299",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3057,21 +3057,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-297"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-296",
-   "return_type" : "type-16",
-   "self_type" : "type-296",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3081,18 +3081,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-294",
-   "return_type" : "type-16",
-   "self_type" : "type-294",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3102,18 +3102,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-339",
-   "return_type" : "type-16",
-   "self_type" : "type-339",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3123,21 +3123,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-512"
+     "referenced_type" : "_ZTIPK15JNINativeMethod"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-511",
-   "return_type" : "type-16",
-   "self_type" : "type-511",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3147,18 +3147,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-51",
-   "return_type" : "type-16",
-   "self_type" : "type-51",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassPKcE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3168,15 +3168,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-518",
-   "return_type" : "type-16",
-   "self_type" : "type-518",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3186,21 +3186,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-128",
-   "return_type" : "type-16",
-   "self_type" : "type-128",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3210,21 +3210,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-126"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-125",
-   "return_type" : "type-16",
-   "self_type" : "type-125",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3234,18 +3234,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-123",
-   "return_type" : "type-16",
-   "self_type" : "type-123",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3255,24 +3255,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-198",
-   "return_type" : "type-16",
-   "self_type" : "type-198",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3282,24 +3282,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-196"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-195",
-   "return_type" : "type-16",
-   "self_type" : "type-195",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3309,21 +3309,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-193",
-   "return_type" : "type-16",
-   "self_type" : "type-193",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3333,18 +3333,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-240",
-   "return_type" : "type-16",
-   "self_type" : "type-240",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3354,15 +3354,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-366"
+     "referenced_type" : "_ZTIP8_jstring"
     }
    ],
-   "referenced_type" : "type-371",
-   "return_type" : "type-16",
-   "self_type" : "type-371",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jstringE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jstringE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3372,15 +3372,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-521"
+     "referenced_type" : "_ZTIPP7_JavaVM"
     }
    ],
-   "referenced_type" : "type-520",
-   "return_type" : "type-16",
-   "self_type" : "type-520",
+   "referenced_type" : "_ZTIFiP7_JNIEnvPP7_JavaVME",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvPP7_JavaVME",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3390,15 +3390,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-59",
-   "return_type" : "type-16",
-   "self_type" : "type-59",
+   "referenced_type" : "_ZTIFiP7_JNIEnviE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3408,12 +3408,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-522"
+     "referenced_type" : "_ZTIP7_JavaVM"
     }
    ],
-   "referenced_type" : "type-528",
-   "return_type" : "type-16",
-   "self_type" : "type-528",
+   "referenced_type" : "_ZTIFiP7_JavaVME",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JavaVME",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3423,18 +3423,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-522"
+     "referenced_type" : "_ZTIP7_JavaVM"
     },
     {
-     "referenced_type" : "type-531"
+     "referenced_type" : "_ZTIPP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "referenced_type" : "type-530",
-   "return_type" : "type-16",
-   "self_type" : "type-530",
+   "referenced_type" : "_ZTIFiP7_JavaVMPP7_JNIEnvPvE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JavaVMPP7_JNIEnvPvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3444,18 +3444,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-522"
+     "referenced_type" : "_ZTIP7_JavaVM"
     },
     {
-     "referenced_type" : "type-534"
+     "referenced_type" : "_ZTIPPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-533",
-   "return_type" : "type-16",
-   "self_type" : "type-533",
+   "referenced_type" : "_ZTIFiP7_JavaVMPPviE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JavaVMPPviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3465,21 +3465,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "_ZTIPPKc"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "referenced_type" : "type-593",
-   "return_type" : "type-16",
-   "self_type" : "type-593",
+   "referenced_type" : "_ZTIFiP8AIBinderiPPKcjE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP8AIBinderiPPKcjE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -3489,21 +3489,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
-     "referenced_type" : "type-587"
+     "referenced_type" : "_ZTIP7AParcel"
     }
    ],
-   "referenced_type" : "type-590",
-   "return_type" : "type-16",
-   "self_type" : "type-590",
+   "referenced_type" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -3513,18 +3513,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "referenced_type" : "type-640",
-   "return_type" : "type-16",
-   "self_type" : "type-640",
+   "referenced_type" : "_ZTIFiPK7AParcelPvjE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiPK7AParcelPvjE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -3534,21 +3534,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-292",
-   "return_type" : "type-77",
-   "self_type" : "type-292",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3558,21 +3558,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-290"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-289",
-   "return_type" : "type-77",
-   "self_type" : "type-289",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3582,18 +3582,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-287",
-   "return_type" : "type-77",
-   "self_type" : "type-287",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3603,18 +3603,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-337",
-   "return_type" : "type-77",
-   "self_type" : "type-337",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3624,21 +3624,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-121",
-   "return_type" : "type-77",
-   "self_type" : "type-121",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3648,21 +3648,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-119"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-118",
-   "return_type" : "type-77",
-   "self_type" : "type-118",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3672,18 +3672,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-116",
-   "return_type" : "type-77",
-   "self_type" : "type-116",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3693,24 +3693,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-191",
-   "return_type" : "type-77",
-   "self_type" : "type-191",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3720,24 +3720,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-189"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-188",
-   "return_type" : "type-77",
-   "self_type" : "type-188",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3747,21 +3747,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-186",
-   "return_type" : "type-77",
-   "self_type" : "type-186",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3771,18 +3771,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-238",
-   "return_type" : "type-77",
-   "self_type" : "type-238",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3792,21 +3792,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-285",
-   "return_type" : "type-76",
-   "self_type" : "type-285",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3816,21 +3816,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-283"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-282",
-   "return_type" : "type-76",
-   "self_type" : "type-282",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3840,18 +3840,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-280",
-   "return_type" : "type-76",
-   "self_type" : "type-280",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3861,18 +3861,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-335",
-   "return_type" : "type-76",
-   "self_type" : "type-335",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3882,21 +3882,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-114",
-   "return_type" : "type-76",
-   "self_type" : "type-114",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3906,21 +3906,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-112"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-111",
-   "return_type" : "type-76",
-   "self_type" : "type-111",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3930,18 +3930,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-109",
-   "return_type" : "type-76",
-   "self_type" : "type-109",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3951,24 +3951,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-184",
-   "return_type" : "type-76",
-   "self_type" : "type-184",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3978,24 +3978,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-182"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-181",
-   "return_type" : "type-76",
-   "self_type" : "type-181",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4005,21 +4005,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-179",
-   "return_type" : "type-76",
-   "self_type" : "type-179",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4029,18 +4029,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-236",
-   "return_type" : "type-76",
-   "self_type" : "type-236",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4050,12 +4050,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     }
    ],
-   "referenced_type" : "type-55",
-   "return_type" : "type-13",
-   "self_type" : "type-55",
+   "referenced_type" : "_ZTIFvP7_JNIEnvE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4065,21 +4065,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "_ZTIP10_jintArray"
     },
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "_ZTIPi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-459",
-   "return_type" : "type-13",
-   "self_type" : "type-459",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayPiiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP10_jintArrayPiiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4089,24 +4089,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "_ZTIP10_jintArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-496"
+     "referenced_type" : "_ZTIPKi"
     }
    ],
-   "referenced_type" : "type-495",
-   "return_type" : "type-13",
-   "self_type" : "type-495",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPKiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPKiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4116,24 +4116,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "_ZTIP10_jintArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "_ZTIPi"
     }
    ],
-   "referenced_type" : "type-475",
-   "return_type" : "type-13",
-   "self_type" : "type-475",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4143,21 +4143,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-401"
+     "referenced_type" : "_ZTIP11_jbyteArray"
     },
     {
-     "referenced_type" : "type-431"
+     "referenced_type" : "_ZTIPa"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-453",
-   "return_type" : "type-13",
-   "self_type" : "type-453",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayPaiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayPaiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4167,24 +4167,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-401"
+     "referenced_type" : "_ZTIP11_jbyteArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "_ZTIPKa"
     }
    ],
-   "referenced_type" : "type-487",
-   "return_type" : "type-13",
-   "self_type" : "type-487",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPKaE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPKaE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4194,24 +4194,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-401"
+     "referenced_type" : "_ZTIP11_jbyteArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-431"
+     "referenced_type" : "_ZTIPa"
     }
    ],
-   "referenced_type" : "type-469",
-   "return_type" : "type-13",
-   "self_type" : "type-469",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPaE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPaE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4221,21 +4221,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "_ZTIP11_jcharArray"
     },
     {
-     "referenced_type" : "type-434"
+     "referenced_type" : "_ZTIPt"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-455",
-   "return_type" : "type-13",
-   "self_type" : "type-455",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayPtiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayPtiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4245,24 +4245,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "_ZTIP11_jcharArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "_ZTIPKt"
     }
    ],
-   "referenced_type" : "type-489",
-   "return_type" : "type-13",
-   "self_type" : "type-489",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPKtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPKtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4272,24 +4272,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "_ZTIP11_jcharArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-434"
+     "referenced_type" : "_ZTIPt"
     }
    ],
-   "referenced_type" : "type-471",
-   "return_type" : "type-13",
-   "self_type" : "type-471",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4299,21 +4299,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-417"
+     "referenced_type" : "_ZTIP11_jlongArray"
     },
     {
-     "referenced_type" : "type-443"
+     "referenced_type" : "_ZTIPx"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-461",
-   "return_type" : "type-13",
-   "self_type" : "type-461",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayPxiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayPxiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4323,24 +4323,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-417"
+     "referenced_type" : "_ZTIP11_jlongArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-500"
+     "referenced_type" : "_ZTIPKx"
     }
    ],
-   "referenced_type" : "type-499",
-   "return_type" : "type-13",
-   "self_type" : "type-499",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPKxE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPKxE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4350,24 +4350,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-417"
+     "referenced_type" : "_ZTIP11_jlongArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-443"
+     "referenced_type" : "_ZTIPx"
     }
    ],
-   "referenced_type" : "type-477",
-   "return_type" : "type-13",
-   "self_type" : "type-477",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPxE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPxE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4377,21 +4377,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-421"
+     "referenced_type" : "_ZTIP12_jfloatArray"
     },
     {
-     "referenced_type" : "type-446"
+     "referenced_type" : "_ZTIPf"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-463",
-   "return_type" : "type-13",
-   "self_type" : "type-463",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayPfiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayPfiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4401,24 +4401,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-421"
+     "referenced_type" : "_ZTIP12_jfloatArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-504"
+     "referenced_type" : "_ZTIPKf"
     }
    ],
-   "referenced_type" : "type-503",
-   "return_type" : "type-13",
-   "self_type" : "type-503",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPKfE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPKfE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4428,24 +4428,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-421"
+     "referenced_type" : "_ZTIP12_jfloatArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-446"
+     "referenced_type" : "_ZTIPf"
     }
    ],
-   "referenced_type" : "type-479",
-   "return_type" : "type-13",
-   "self_type" : "type-479",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPfE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPfE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4455,21 +4455,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-409"
+     "referenced_type" : "_ZTIP12_jshortArray"
     },
     {
-     "referenced_type" : "type-437"
+     "referenced_type" : "_ZTIPs"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-457",
-   "return_type" : "type-13",
-   "self_type" : "type-457",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayPsiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayPsiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4479,24 +4479,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-409"
+     "referenced_type" : "_ZTIP12_jshortArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-492"
+     "referenced_type" : "_ZTIPKs"
     }
    ],
-   "referenced_type" : "type-491",
-   "return_type" : "type-13",
-   "self_type" : "type-491",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPKsE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPKsE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4506,24 +4506,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-409"
+     "referenced_type" : "_ZTIP12_jshortArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-437"
+     "referenced_type" : "_ZTIPs"
     }
    ],
-   "referenced_type" : "type-473",
-   "return_type" : "type-13",
-   "self_type" : "type-473",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPsE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPsE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4533,21 +4533,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-425"
+     "referenced_type" : "_ZTIP13_jdoubleArray"
     },
     {
-     "referenced_type" : "type-449"
+     "referenced_type" : "_ZTIPd"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-465",
-   "return_type" : "type-13",
-   "self_type" : "type-465",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayPdiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayPdiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4557,24 +4557,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-425"
+     "referenced_type" : "_ZTIP13_jdoubleArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-508"
+     "referenced_type" : "_ZTIPKd"
     }
    ],
-   "referenced_type" : "type-507",
-   "return_type" : "type-13",
-   "self_type" : "type-507",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4584,24 +4584,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-425"
+     "referenced_type" : "_ZTIP13_jdoubleArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-449"
+     "referenced_type" : "_ZTIPd"
     }
    ],
-   "referenced_type" : "type-481",
-   "return_type" : "type-13",
-   "self_type" : "type-481",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPdE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPdE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4611,21 +4611,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-389"
+     "referenced_type" : "_ZTIP13_jobjectArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-394",
-   "return_type" : "type-13",
-   "self_type" : "type-394",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4635,21 +4635,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "_ZTIP14_jbooleanArray"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-451",
-   "return_type" : "type-13",
-   "self_type" : "type-451",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayPhiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayPhiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4659,24 +4659,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "_ZTIP14_jbooleanArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "_ZTIPKh"
     }
    ],
-   "referenced_type" : "type-483",
-   "return_type" : "type-13",
-   "self_type" : "type-483",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4686,24 +4686,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "_ZTIP14_jbooleanArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-467",
-   "return_type" : "type-13",
-   "self_type" : "type-467",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPhE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4713,21 +4713,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "_ZTIP7_jarray"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-543",
-   "return_type" : "type-13",
-   "self_type" : "type-543",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jarrayPviE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jarrayPviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4737,21 +4737,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-327",
-   "return_type" : "type-13",
-   "self_type" : "type-327",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4761,21 +4761,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-325"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-324",
-   "return_type" : "type-13",
-   "self_type" : "type-324",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4785,18 +4785,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-322",
-   "return_type" : "type-13",
-   "self_type" : "type-322",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4806,21 +4806,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-347",
-   "return_type" : "type-13",
-   "self_type" : "type-347",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4830,21 +4830,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-26"
+     "referenced_type" : "_ZTIa"
     }
    ],
-   "referenced_type" : "type-351",
-   "return_type" : "type-13",
-   "self_type" : "type-351",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4854,21 +4854,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "_ZTId"
     }
    ],
-   "referenced_type" : "type-363",
-   "return_type" : "type-13",
-   "self_type" : "type-363",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4878,21 +4878,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-79"
+     "referenced_type" : "_ZTIf"
     }
    ],
-   "referenced_type" : "type-361",
-   "return_type" : "type-13",
-   "self_type" : "type-361",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4902,21 +4902,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     }
    ],
-   "referenced_type" : "type-349",
-   "return_type" : "type-13",
-   "self_type" : "type-349",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4926,21 +4926,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-357",
-   "return_type" : "type-13",
-   "self_type" : "type-357",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4950,21 +4950,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-77"
+     "referenced_type" : "_ZTIs"
     }
    ],
-   "referenced_type" : "type-355",
-   "return_type" : "type-13",
-   "self_type" : "type-355",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4974,21 +4974,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "_ZTIt"
     }
    ],
-   "referenced_type" : "type-353",
-   "return_type" : "type-13",
-   "self_type" : "type-353",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4998,21 +4998,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "_ZTIx"
     }
    ],
-   "referenced_type" : "type-359",
-   "return_type" : "type-13",
-   "self_type" : "type-359",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDxE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDxE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5022,15 +5022,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-63",
-   "return_type" : "type-13",
-   "self_type" : "type-63",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5040,21 +5040,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-156",
-   "return_type" : "type-13",
-   "self_type" : "type-156",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5064,21 +5064,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-153",
-   "return_type" : "type-13",
-   "self_type" : "type-153",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5088,18 +5088,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-151",
-   "return_type" : "type-13",
-   "self_type" : "type-151",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5109,24 +5109,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-226",
-   "return_type" : "type-13",
-   "self_type" : "type-226",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5136,24 +5136,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-224"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-223",
-   "return_type" : "type-13",
-   "self_type" : "type-223",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5163,21 +5163,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-221",
-   "return_type" : "type-13",
-   "self_type" : "type-221",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5187,21 +5187,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-248",
-   "return_type" : "type-13",
-   "self_type" : "type-248",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5211,21 +5211,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-26"
+     "referenced_type" : "_ZTIa"
     }
    ],
-   "referenced_type" : "type-252",
-   "return_type" : "type-13",
-   "self_type" : "type-252",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5235,21 +5235,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "_ZTId"
     }
    ],
-   "referenced_type" : "type-264",
-   "return_type" : "type-13",
-   "self_type" : "type-264",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5259,21 +5259,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-79"
+     "referenced_type" : "_ZTIf"
     }
    ],
-   "referenced_type" : "type-262",
-   "return_type" : "type-13",
-   "self_type" : "type-262",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5283,21 +5283,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     }
    ],
-   "referenced_type" : "type-250",
-   "return_type" : "type-13",
-   "self_type" : "type-250",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5307,21 +5307,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-258",
-   "return_type" : "type-13",
-   "self_type" : "type-258",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5331,21 +5331,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-77"
+     "referenced_type" : "_ZTIs"
     }
    ],
-   "referenced_type" : "type-256",
-   "return_type" : "type-13",
-   "self_type" : "type-256",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5355,21 +5355,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "_ZTIt"
     }
    ],
-   "referenced_type" : "type-254",
-   "return_type" : "type-13",
-   "self_type" : "type-254",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5379,21 +5379,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "_ZTIx"
     }
    ],
-   "referenced_type" : "type-260",
-   "return_type" : "type-13",
-   "self_type" : "type-260",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDxE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDxE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5403,18 +5403,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-366"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-382",
-   "return_type" : "type-13",
-   "self_type" : "type-382",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringPKcE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jstringPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5424,18 +5424,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-366"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "_ZTIPKt"
     }
    ],
-   "referenced_type" : "type-376",
-   "return_type" : "type-13",
-   "self_type" : "type-376",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringPKtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jstringPKtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5445,24 +5445,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-366"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-539"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-538",
-   "return_type" : "type-13",
-   "self_type" : "type-538",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPcE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5472,24 +5472,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-366"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-434"
+     "referenced_type" : "_ZTIPt"
     }
    ],
-   "referenced_type" : "type-536",
-   "return_type" : "type-13",
-   "self_type" : "type-536",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5499,15 +5499,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-57",
-   "return_type" : "type-13",
-   "self_type" : "type-57",
+   "referenced_type" : "_ZTIFvP7_JNIEnvPKcE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5517,12 +5517,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "referenced_type" : "type-602",
-   "return_type" : "type-13",
-   "self_type" : "type-602",
+   "referenced_type" : "_ZTIFvPvE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvPvE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5532,18 +5532,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-599"
+     "referenced_type" : "_ZTIb"
     }
    ],
-   "referenced_type" : "type-679",
-   "return_type" : "type-13",
-   "self_type" : "type-679",
+   "referenced_type" : "_ZTIFvPvjbE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvPvjbE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -5553,21 +5553,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-306",
-   "return_type" : "type-78",
-   "self_type" : "type-306",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5577,21 +5577,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-304"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-303",
-   "return_type" : "type-78",
-   "self_type" : "type-303",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5601,18 +5601,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-301",
-   "return_type" : "type-78",
-   "self_type" : "type-301",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5622,18 +5622,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-341",
-   "return_type" : "type-78",
-   "self_type" : "type-341",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5643,15 +5643,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-551",
-   "return_type" : "type-78",
-   "self_type" : "type-551",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5661,21 +5661,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-135",
-   "return_type" : "type-78",
-   "self_type" : "type-135",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5685,21 +5685,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-133"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-132",
-   "return_type" : "type-78",
-   "self_type" : "type-132",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5709,18 +5709,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-130",
-   "return_type" : "type-78",
-   "self_type" : "type-130",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5730,24 +5730,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-205",
-   "return_type" : "type-78",
-   "self_type" : "type-205",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5757,24 +5757,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-203"
+     "referenced_type" : "_ZTISt9__va_list"
     }
    ],
-   "referenced_type" : "type-202",
-   "return_type" : "type-78",
-   "self_type" : "type-202",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5784,21 +5784,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-200",
-   "return_type" : "type-78",
-   "self_type" : "type-200",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5808,18 +5808,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-242",
-   "return_type" : "type-78",
-   "self_type" : "type-242",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   }
  ],
@@ -5828,7 +5828,7 @@
   {
    "function_name" : "ABinderProcess_joinThreadPool",
    "linker_set_key" : "ABinderProcess_joinThreadPool",
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_process.h"
   },
   {
@@ -5837,16 +5837,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "type-599",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_process.h"
   },
   {
    "function_name" : "ABinderProcess_startThreadPool",
    "linker_set_key" : "ABinderProcess_startThreadPool",
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_process.h"
   },
   {
@@ -5855,19 +5855,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-611"
+     "referenced_type" : "_ZTIPFPvS_E"
     },
     {
-     "referenced_type" : "type-618"
+     "referenced_type" : "_ZTIPFvPvE"
     },
     {
-     "referenced_type" : "type-589"
+     "referenced_type" : "_ZTIPFiP8AIBinderjPK7AParcelPS1_E"
     }
    ],
-   "return_type" : "type-1",
+   "return_type" : "_ZTIP14AIBinder_Class",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5876,13 +5876,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1"
+     "referenced_type" : "_ZTIP14AIBinder_Class"
     },
     {
-     "referenced_type" : "type-595"
+     "referenced_type" : "_ZTIPFiP8AIBinderiPPKcjE"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5891,10 +5891,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-604"
+     "referenced_type" : "_ZTIP23AIBinder_DeathRecipient"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5903,10 +5903,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-618"
+     "referenced_type" : "_ZTIPFvPvE"
     }
    ],
-   "return_type" : "type-604",
+   "return_type" : "_ZTIP23AIBinder_DeathRecipient",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5915,10 +5915,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-607"
+     "referenced_type" : "_ZTIP13AIBinder_Weak"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5927,10 +5927,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-607",
+   "return_type" : "_ZTIP13AIBinder_Weak",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5939,10 +5939,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-607"
+     "referenced_type" : "_ZTIP13AIBinder_Weak"
     }
    ],
-   "return_type" : "type-591",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5951,13 +5951,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-598"
+     "referenced_type" : "_ZTIPK14AIBinder_Class"
     }
    ],
-   "return_type" : "type-599",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5966,10 +5966,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5978,10 +5978,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5990,19 +5990,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "_ZTIPPKc"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6011,25 +6011,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "type-616",
+   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder_jni.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
   },
   {
    "function_name" : "AIBinder_getCallingPid",
    "linker_set_key" : "AIBinder_getCallingPid",
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
    "function_name" : "AIBinder_getCallingUid",
    "linker_set_key" : "AIBinder_getCallingUid",
-   "return_type" : "type-555",
+   "return_type" : "_ZTIj",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6038,10 +6038,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-598",
+   "return_type" : "_ZTIPK14AIBinder_Class",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6050,13 +6050,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-609"
+     "referenced_type" : "_ZTIPP8AIBinder"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6065,10 +6065,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "_ZTIPv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6077,10 +6077,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6089,10 +6089,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-603"
+     "referenced_type" : "_ZTIPK8AIBinder"
     }
    ],
-   "return_type" : "type-599",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6101,10 +6101,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-603"
+     "referenced_type" : "_ZTIPK8AIBinder"
     }
    ],
-   "return_type" : "type-599",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6113,16 +6113,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-604"
+     "referenced_type" : "_ZTIP23AIBinder_DeathRecipient"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6131,10 +6131,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-688"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/stability.sdump"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h"
   },
   {
@@ -6143,10 +6143,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-688"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/stability.sdump"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h"
   },
   {
@@ -6155,13 +6155,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-598"
+     "referenced_type" : "_ZTIPK14AIBinder_Class"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "return_type" : "type-591",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6170,10 +6170,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6182,13 +6182,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "_ZTIPP7AParcel"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6197,13 +6197,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6212,13 +6212,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-616"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder_jni.sdump"
     }
    ],
-   "return_type" : "type-5",
+   "return_type" : "_ZTIP8_jobject",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
   },
   {
@@ -6227,22 +6227,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "_ZTIPP7AParcel"
     },
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "_ZTIPP7AParcel"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6251,16 +6251,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-604"
+     "referenced_type" : "_ZTIP23AIBinder_DeathRecipient"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6269,10 +6269,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6281,10 +6281,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6293,13 +6293,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-649"
+     "referenced_type" : "_ZTIPb"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6308,19 +6308,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-635"
+     "referenced_type" : "_ZTIPFbPviE"
     },
     {
-     "referenced_type" : "type-680"
+     "referenced_type" : "_ZTIPFvPvjbE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6329,13 +6329,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-431"
+     "referenced_type" : "_ZTIPa"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6344,16 +6344,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-687"
+     "referenced_type" : "_ZTIPFbPviPPaE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6362,13 +6362,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-650"
+     "referenced_type" : "_ZTIPDs"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6377,16 +6377,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-684"
+     "referenced_type" : "_ZTIPFbPviPPDsE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6395,13 +6395,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-449"
+     "referenced_type" : "_ZTIPd"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6410,16 +6410,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-678"
+     "referenced_type" : "_ZTIPFbPviPPdE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6428,13 +6428,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-446"
+     "referenced_type" : "_ZTIPf"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6443,16 +6443,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-675"
+     "referenced_type" : "_ZTIPFbPviPPfE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6461,13 +6461,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "_ZTIPi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6476,16 +6476,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-661"
+     "referenced_type" : "_ZTIPFbPviPPiE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6494,13 +6494,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-443"
+     "referenced_type" : "_ZTIPx"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6509,16 +6509,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-667"
+     "referenced_type" : "_ZTIPFbPviPPxE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6527,13 +6527,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "_ZTIPi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6542,19 +6542,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-635"
+     "referenced_type" : "_ZTIPFbPviE"
     },
     {
-     "referenced_type" : "type-644"
+     "referenced_type" : "_ZTIPFiPK7AParcelPvjE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6563,13 +6563,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-624"
+     "referenced_type" : "_ZTIPP7AStatus"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6578,16 +6578,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-627"
+     "referenced_type" : "_ZTIPFbPviPPcE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6596,19 +6596,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-635"
+     "referenced_type" : "_ZTIPFbPviE"
     },
     {
-     "referenced_type" : "type-637"
+     "referenced_type" : "_ZTIPFbPvjiPPcE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6617,13 +6617,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-681"
+     "referenced_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6632,13 +6632,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-647"
+     "referenced_type" : "_ZTIPj"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6647,16 +6647,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-664"
+     "referenced_type" : "_ZTIPFbPviPPjE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6665,13 +6665,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-648"
+     "referenced_type" : "_ZTIPy"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6680,16 +6680,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-672"
+     "referenced_type" : "_ZTIPFbPviPPyE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6698,13 +6698,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6713,13 +6713,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-599"
+     "referenced_type" : "_ZTIb"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6728,19 +6728,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-656"
+     "referenced_type" : "_ZTIPFbPKvjE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6749,13 +6749,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-26"
+     "referenced_type" : "_ZTIa"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6764,16 +6764,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "_ZTIPKa"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6782,13 +6782,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-646"
+     "referenced_type" : "_ZTIDs"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6797,16 +6797,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-658"
+     "referenced_type" : "_ZTIPKDs"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6815,13 +6815,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "_ZTId"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6830,16 +6830,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-508"
+     "referenced_type" : "_ZTIPKd"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6848,13 +6848,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-79"
+     "referenced_type" : "_ZTIf"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6863,16 +6863,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-504"
+     "referenced_type" : "_ZTIPKf"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6881,13 +6881,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6896,16 +6896,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-496"
+     "referenced_type" : "_ZTIPKi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6914,13 +6914,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "_ZTIx"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6929,16 +6929,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-500"
+     "referenced_type" : "_ZTIPKx"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6947,13 +6947,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6962,19 +6962,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPFiP7AParcelPKvjE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6983,13 +6983,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-621"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6998,16 +6998,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7016,19 +7016,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-631"
+     "referenced_type" : "_ZTIPFPKcPKvjPiE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7037,13 +7037,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-670"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7052,13 +7052,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7067,16 +7067,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-652"
+     "referenced_type" : "_ZTIPKj"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7085,13 +7085,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-645"
+     "referenced_type" : "_ZTIy"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7100,16 +7100,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-654"
+     "referenced_type" : "_ZTIPKy"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7118,13 +7118,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-695"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7133,10 +7133,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-695",
+   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7145,10 +7145,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-695",
+   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7157,10 +7157,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-690"
+     "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7169,10 +7169,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7181,10 +7181,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-690",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7193,13 +7193,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-690",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7208,10 +7208,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-690",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7220,13 +7220,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-690",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7235,10 +7235,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-690",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7247,10 +7247,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-694"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-21",
+   "return_type" : "_ZTIPKc",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7259,10 +7259,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-694"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7271,10 +7271,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-694"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-21",
+   "return_type" : "_ZTIPKc",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7283,10 +7283,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-694"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7295,10 +7295,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-694"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7307,16 +7307,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-694"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-599",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
    "function_name" : "AStatus_newOk",
    "linker_set_key" : "AStatus_newOk",
-   "return_type" : "type-690",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   }
  ],
@@ -7328,8 +7328,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP10_jintArray",
    "name" : "_jintArray *",
-   "referenced_type" : "type-414",
-   "self_type" : "type-413",
+   "referenced_type" : "_ZTI10_jintArray",
+   "self_type" : "_ZTIP10_jintArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7337,17 +7337,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP10_jmethodID",
    "name" : "_jmethodID *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-31",
-   "size" : 4,
-   "source_file" : "/libnativehelper/include_jni/jni.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP10_jmethodID",
-   "name" : "_jmethodID *",
-   "referenced_type" : "type-719",
-   "self_type" : "type-718",
+   "referenced_type" : "_ZTI10_jmethodID",
+   "self_type" : "_ZTIP10_jmethodID",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7355,8 +7346,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP11_jbyteArray",
    "name" : "_jbyteArray *",
-   "referenced_type" : "type-402",
-   "self_type" : "type-401",
+   "referenced_type" : "_ZTI11_jbyteArray",
+   "self_type" : "_ZTIP11_jbyteArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7364,8 +7355,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP11_jcharArray",
    "name" : "_jcharArray *",
-   "referenced_type" : "type-406",
-   "self_type" : "type-405",
+   "referenced_type" : "_ZTI11_jcharArray",
+   "self_type" : "_ZTIP11_jcharArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7373,8 +7364,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP11_jlongArray",
    "name" : "_jlongArray *",
-   "referenced_type" : "type-418",
-   "self_type" : "type-417",
+   "referenced_type" : "_ZTI11_jlongArray",
+   "self_type" : "_ZTIP11_jlongArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7382,8 +7373,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP11_jthrowable",
    "name" : "_jthrowable *",
-   "referenced_type" : "type-49",
-   "self_type" : "type-48",
+   "referenced_type" : "_ZTI11_jthrowable",
+   "self_type" : "_ZTIP11_jthrowable",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7391,8 +7382,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP12JavaVMOption",
    "name" : "JavaVMOption *",
-   "referenced_type" : "type-613",
-   "self_type" : "type-615",
+   "referenced_type" : "_ZTI12JavaVMOption",
+   "self_type" : "_ZTIP12JavaVMOption",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7400,8 +7391,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP12_jfloatArray",
    "name" : "_jfloatArray *",
-   "referenced_type" : "type-422",
-   "self_type" : "type-421",
+   "referenced_type" : "_ZTI12_jfloatArray",
+   "self_type" : "_ZTIP12_jfloatArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7409,8 +7400,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP12_jshortArray",
    "name" : "_jshortArray *",
-   "referenced_type" : "type-410",
-   "self_type" : "type-409",
+   "referenced_type" : "_ZTI12_jshortArray",
+   "self_type" : "_ZTIP12_jshortArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7418,17 +7409,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP13AIBinder_Weak",
    "name" : "AIBinder_Weak *",
-   "referenced_type" : "type-608",
-   "self_type" : "type-607",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP13AIBinder_Weak",
-   "name" : "AIBinder_Weak *",
-   "referenced_type" : "type-716",
-   "self_type" : "type-715",
+   "referenced_type" : "_ZTI13AIBinder_Weak",
+   "self_type" : "_ZTIP13AIBinder_Weak",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -7436,8 +7418,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP13_jdoubleArray",
    "name" : "_jdoubleArray *",
-   "referenced_type" : "type-426",
-   "self_type" : "type-425",
+   "referenced_type" : "_ZTI13_jdoubleArray",
+   "self_type" : "_ZTIP13_jdoubleArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7445,8 +7427,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP13_jobjectArray",
    "name" : "_jobjectArray *",
-   "referenced_type" : "type-390",
-   "self_type" : "type-389",
+   "referenced_type" : "_ZTI13_jobjectArray",
+   "self_type" : "_ZTIP13_jobjectArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7454,17 +7436,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP14AIBinder_Class",
    "name" : "AIBinder_Class *",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP14AIBinder_Class",
-   "name" : "AIBinder_Class *",
-   "referenced_type" : "type-698",
-   "self_type" : "type-697",
+   "referenced_type" : "_ZTI14AIBinder_Class",
+   "self_type" : "_ZTIP14AIBinder_Class",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -7472,8 +7445,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP14_jbooleanArray",
    "name" : "_jbooleanArray *",
-   "referenced_type" : "type-398",
-   "self_type" : "type-397",
+   "referenced_type" : "_ZTI14_jbooleanArray",
+   "self_type" : "_ZTIP14_jbooleanArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7481,35 +7454,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP23AIBinder_DeathRecipient",
    "name" : "AIBinder_DeathRecipient *",
-   "referenced_type" : "type-605",
-   "self_type" : "type-604",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP23AIBinder_DeathRecipient",
-   "name" : "AIBinder_DeathRecipient *",
-   "referenced_type" : "type-713",
-   "self_type" : "type-712",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP7AParcel",
-   "name" : "AParcel *",
-   "referenced_type" : "type-565",
-   "self_type" : "type-564",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP7AParcel",
-   "name" : "AParcel *",
-   "referenced_type" : "type-588",
-   "self_type" : "type-587",
+   "referenced_type" : "_ZTI23AIBinder_DeathRecipient",
+   "self_type" : "_ZTIP23AIBinder_DeathRecipient",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -7517,17 +7463,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP7AParcel",
    "name" : "AParcel *",
-   "referenced_type" : "type-633",
-   "self_type" : "type-632",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP7AParcel",
-   "name" : "AParcel *",
-   "referenced_type" : "type-705",
-   "self_type" : "type-704",
+   "referenced_type" : "_ZTI7AParcel",
+   "self_type" : "_ZTIP7AParcel",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -7535,44 +7472,17 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP7AStatus",
    "name" : "AStatus *",
-   "referenced_type" : "type-562",
-   "self_type" : "type-561",
+   "referenced_type" : "_ZTI7AStatus",
+   "self_type" : "_ZTIP7AStatus",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP7AStatus",
-   "name" : "AStatus *",
-   "referenced_type" : "type-575",
-   "self_type" : "type-574",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP7AStatus",
-   "name" : "AStatus *",
-   "referenced_type" : "type-623",
-   "self_type" : "type-622",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP7AStatus",
-   "name" : "AStatus *",
-   "referenced_type" : "type-691",
-   "self_type" : "type-690",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP7_JNIEnv",
    "name" : "_JNIEnv *",
-   "referenced_type" : "type-8",
-   "self_type" : "type-7",
+   "referenced_type" : "_ZTI7_JNIEnv",
+   "self_type" : "_ZTIP7_JNIEnv",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7580,8 +7490,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP7_JavaVM",
    "name" : "_JavaVM *",
-   "referenced_type" : "type-523",
-   "self_type" : "type-522",
+   "referenced_type" : "_ZTI7_JavaVM",
+   "self_type" : "_ZTIP7_JavaVM",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7589,8 +7499,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP7_jarray",
    "name" : "_jarray *",
-   "referenced_type" : "type-386",
-   "self_type" : "type-385",
+   "referenced_type" : "_ZTI7_jarray",
+   "self_type" : "_ZTIP7_jarray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7598,8 +7508,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP7_jclass",
    "name" : "_jclass *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-19",
+   "referenced_type" : "_ZTI7_jclass",
+   "self_type" : "_ZTIP7_jclass",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7607,89 +7517,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP8AIBinder",
    "name" : "AIBinder *",
-   "referenced_type" : "type-557",
-   "self_type" : "type-556",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-570",
-   "self_type" : "type-569",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-573",
-   "self_type" : "type-572",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-580",
-   "self_type" : "type-579",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-592",
-   "self_type" : "type-591",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-617",
-   "self_type" : "type-616",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-671",
-   "self_type" : "type-670",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-689",
-   "self_type" : "type-688",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-696",
-   "self_type" : "type-695",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-700",
-   "self_type" : "type-699",
+   "referenced_type" : "_ZTI8AIBinder",
+   "self_type" : "_ZTIP8AIBinder",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -7697,8 +7526,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP8_jobject",
    "name" : "_jobject *",
-   "referenced_type" : "type-6",
-   "self_type" : "type-5",
+   "referenced_type" : "_ZTI8_jobject",
+   "self_type" : "_ZTIP8_jobject",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7706,17 +7535,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP8_jstring",
    "name" : "_jstring *",
-   "referenced_type" : "type-367",
-   "self_type" : "type-366",
-   "size" : 4,
-   "source_file" : "/libnativehelper/include_jni/jni.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP9_jfieldID",
-   "name" : "_jfieldID *",
-   "referenced_type" : "type-36",
-   "self_type" : "type-35",
+   "referenced_type" : "_ZTI8_jstring",
+   "self_type" : "_ZTIP8_jstring",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7724,8 +7544,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP9_jfieldID",
    "name" : "_jfieldID *",
-   "referenced_type" : "type-721",
-   "self_type" : "type-720",
+   "referenced_type" : "_ZTI9_jfieldID",
+   "self_type" : "_ZTIP9_jfieldID",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7733,8 +7553,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPDs",
    "name" : "char16_t *",
-   "referenced_type" : "type-646",
-   "self_type" : "type-650",
+   "referenced_type" : "_ZTIDs",
+   "self_type" : "_ZTIPDs",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -7742,8 +7562,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
    "name" : "jobjectRefType (*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
+   "referenced_type" : "_ZTIF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7751,8 +7571,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP10_jintArrayP7_JNIEnviE",
    "name" : "_jintArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-412",
-   "self_type" : "type-411",
+   "referenced_type" : "_ZTIFP10_jintArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP10_jintArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7760,8 +7580,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
    "name" : "_jmethodID *(*)(_JNIEnv *, _jclass *, const char *, const char *)",
-   "referenced_type" : "type-86",
-   "self_type" : "type-85",
+   "referenced_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
+   "self_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7769,8 +7589,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP10_jmethodIDP7_JNIEnvP8_jobjectE",
    "name" : "_jmethodID *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-30",
-   "self_type" : "type-29",
+   "referenced_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7778,8 +7598,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP11_jbyteArrayP7_JNIEnviE",
    "name" : "_jbyteArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-400",
-   "self_type" : "type-399",
+   "referenced_type" : "_ZTIFP11_jbyteArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP11_jbyteArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7787,8 +7607,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP11_jcharArrayP7_JNIEnviE",
    "name" : "_jcharArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-404",
-   "self_type" : "type-403",
+   "referenced_type" : "_ZTIFP11_jcharArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP11_jcharArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7796,8 +7616,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP11_jlongArrayP7_JNIEnviE",
    "name" : "_jlongArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-416",
-   "self_type" : "type-415",
+   "referenced_type" : "_ZTIFP11_jlongArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP11_jlongArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7805,8 +7625,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP11_jthrowableP7_JNIEnvE",
    "name" : "_jthrowable *(*)(_JNIEnv *)",
-   "referenced_type" : "type-53",
-   "self_type" : "type-52",
+   "referenced_type" : "_ZTIFP11_jthrowableP7_JNIEnvE",
+   "self_type" : "_ZTIPFP11_jthrowableP7_JNIEnvE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7814,8 +7634,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP12_jfloatArrayP7_JNIEnviE",
    "name" : "_jfloatArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-420",
-   "self_type" : "type-419",
+   "referenced_type" : "_ZTIFP12_jfloatArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP12_jfloatArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7823,8 +7643,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP12_jshortArrayP7_JNIEnviE",
    "name" : "_jshortArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-408",
-   "self_type" : "type-407",
+   "referenced_type" : "_ZTIFP12_jshortArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP12_jshortArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7832,8 +7652,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP13_jdoubleArrayP7_JNIEnviE",
    "name" : "_jdoubleArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-424",
-   "self_type" : "type-423",
+   "referenced_type" : "_ZTIFP13_jdoubleArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP13_jdoubleArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7841,8 +7661,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
    "name" : "_jobjectArray *(*)(_JNIEnv *, int, _jclass *, _jobject *)",
-   "referenced_type" : "type-388",
-   "self_type" : "type-387",
+   "referenced_type" : "_ZTIFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
+   "self_type" : "_ZTIPFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7850,8 +7670,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP14_jbooleanArrayP7_JNIEnviE",
    "name" : "_jbooleanArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-396",
-   "self_type" : "type-395",
+   "referenced_type" : "_ZTIFP14_jbooleanArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP14_jbooleanArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7859,8 +7679,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP7_jclassP7_JNIEnvP8_jobjectE",
    "name" : "_jclass *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-82",
-   "self_type" : "type-81",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFP7_jclassP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7868,8 +7688,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP7_jclassP7_JNIEnvPKcE",
    "name" : "_jclass *(*)(_JNIEnv *, const char *)",
-   "referenced_type" : "type-28",
-   "self_type" : "type-27",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvPKcE",
+   "self_type" : "_ZTIPFP7_jclassP7_JNIEnvPKcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7877,8 +7697,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
    "name" : "_jclass *(*)(_JNIEnv *, const char *, _jobject *, const signed char *, int)",
-   "referenced_type" : "type-18",
-   "self_type" : "type-17",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
+   "self_type" : "_ZTIPFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7886,8 +7706,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP7_jclassP7_JNIEnvS0_E",
    "name" : "_jclass *(*)(_JNIEnv *, _jclass *)",
-   "referenced_type" : "type-41",
-   "self_type" : "type-40",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvS0_E",
+   "self_type" : "_ZTIPFP7_jclassP7_JNIEnvS0_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7895,8 +7715,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobjectArray *, int)",
-   "referenced_type" : "type-392",
-   "self_type" : "type-391",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7904,8 +7724,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *)",
-   "referenced_type" : "type-4",
-   "self_type" : "type-3",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7913,8 +7733,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-72",
-   "self_type" : "type-71",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7922,8 +7742,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-69",
-   "self_type" : "type-68",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7931,8 +7751,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jmethodID *, unsigned char)",
-   "referenced_type" : "type-38",
-   "self_type" : "type-37",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7940,8 +7760,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-67",
-   "self_type" : "type-66",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7949,8 +7769,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-329",
-   "self_type" : "type-328",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7958,8 +7778,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jfieldID *, unsigned char)",
-   "referenced_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7967,8 +7787,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvPvxE",
    "name" : "_jobject *(*)(_JNIEnv *, void *, long long)",
-   "referenced_type" : "type-547",
-   "self_type" : "type-546",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvPvxE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvPvxE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7976,8 +7796,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-61",
-   "self_type" : "type-60",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_E",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7985,8 +7805,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-93",
-   "self_type" : "type-92",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7994,8 +7814,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDSt9__va_listE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-90",
-   "self_type" : "type-89",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8003,8 +7823,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-88",
-   "self_type" : "type-87",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8012,8 +7832,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-163",
-   "self_type" : "type-162",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8021,8 +7841,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-160",
-   "self_type" : "type-159",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8030,8 +7850,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-158",
-   "self_type" : "type-157",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8039,8 +7859,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-230",
-   "self_type" : "type-229",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8048,8 +7868,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jstringP7_JNIEnvPKcE",
    "name" : "_jstring *(*)(_JNIEnv *, const char *)",
-   "referenced_type" : "type-378",
-   "self_type" : "type-377",
+   "referenced_type" : "_ZTIFP8_jstringP7_JNIEnvPKcE",
+   "self_type" : "_ZTIPFP8_jstringP7_JNIEnvPKcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8057,8 +7877,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jstringP7_JNIEnvPKtiE",
    "name" : "_jstring *(*)(_JNIEnv *, const unsigned short *, int)",
-   "referenced_type" : "type-365",
-   "self_type" : "type-364",
+   "referenced_type" : "_ZTIFP8_jstringP7_JNIEnvPKtiE",
+   "self_type" : "_ZTIPFP8_jstringP7_JNIEnvPKtiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8066,8 +7886,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
    "name" : "_jfieldID *(*)(_JNIEnv *, _jclass *, const char *, const char *)",
-   "referenced_type" : "type-228",
-   "self_type" : "type-227",
+   "referenced_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
+   "self_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8075,8 +7895,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP9_jfieldIDP7_JNIEnvP8_jobjectE",
    "name" : "_jfieldID *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-34",
-   "self_type" : "type-33",
+   "referenced_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8084,8 +7904,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPKcP7_JNIEnvP8_jstringPhE",
    "name" : "const char *(*)(_JNIEnv *, _jstring *, unsigned char *)",
-   "referenced_type" : "type-380",
-   "self_type" : "type-379",
+   "referenced_type" : "_ZTIFPKcP7_JNIEnvP8_jstringPhE",
+   "self_type" : "_ZTIPFPKcP7_JNIEnvP8_jstringPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8093,8 +7913,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPKcPKvjPiE",
    "name" : "const char *(*)(const void *, unsigned int, int *)",
-   "referenced_type" : "type-630",
-   "self_type" : "type-631",
+   "referenced_type" : "_ZTIFPKcPKvjPiE",
+   "self_type" : "_ZTIPFPKcPKvjPiE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8102,8 +7922,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPKtP7_JNIEnvP8_jstringPhE",
    "name" : "const unsigned short *(*)(_JNIEnv *, _jstring *, unsigned char *)",
-   "referenced_type" : "type-373",
-   "self_type" : "type-372",
+   "referenced_type" : "_ZTIFPKtP7_JNIEnvP8_jstringPhE",
+   "self_type" : "_ZTIPFPKtP7_JNIEnvP8_jstringPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8111,8 +7931,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPaP7_JNIEnvP11_jbyteArrayPhE",
    "name" : "signed char *(*)(_JNIEnv *, _jbyteArray *, unsigned char *)",
-   "referenced_type" : "type-430",
-   "self_type" : "type-429",
+   "referenced_type" : "_ZTIFPaP7_JNIEnvP11_jbyteArrayPhE",
+   "self_type" : "_ZTIPFPaP7_JNIEnvP11_jbyteArrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8120,8 +7940,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPdP7_JNIEnvP13_jdoubleArrayPhE",
    "name" : "double *(*)(_JNIEnv *, _jdoubleArray *, unsigned char *)",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
+   "referenced_type" : "_ZTIFPdP7_JNIEnvP13_jdoubleArrayPhE",
+   "self_type" : "_ZTIPFPdP7_JNIEnvP13_jdoubleArrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8129,8 +7949,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPfP7_JNIEnvP12_jfloatArrayPhE",
    "name" : "float *(*)(_JNIEnv *, _jfloatArray *, unsigned char *)",
-   "referenced_type" : "type-445",
-   "self_type" : "type-444",
+   "referenced_type" : "_ZTIFPfP7_JNIEnvP12_jfloatArrayPhE",
+   "self_type" : "_ZTIPFPfP7_JNIEnvP12_jfloatArrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8138,8 +7958,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPhP7_JNIEnvP14_jbooleanArrayS_E",
    "name" : "unsigned char *(*)(_JNIEnv *, _jbooleanArray *, unsigned char *)",
-   "referenced_type" : "type-428",
-   "self_type" : "type-427",
+   "referenced_type" : "_ZTIFPhP7_JNIEnvP14_jbooleanArrayS_E",
+   "self_type" : "_ZTIPFPhP7_JNIEnvP14_jbooleanArrayS_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8147,8 +7967,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPiP7_JNIEnvP10_jintArrayPhE",
    "name" : "int *(*)(_JNIEnv *, _jintArray *, unsigned char *)",
-   "referenced_type" : "type-439",
-   "self_type" : "type-438",
+   "referenced_type" : "_ZTIFPiP7_JNIEnvP10_jintArrayPhE",
+   "self_type" : "_ZTIPFPiP7_JNIEnvP10_jintArrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8156,8 +7976,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPsP7_JNIEnvP12_jshortArrayPhE",
    "name" : "short *(*)(_JNIEnv *, _jshortArray *, unsigned char *)",
-   "referenced_type" : "type-436",
-   "self_type" : "type-435",
+   "referenced_type" : "_ZTIFPsP7_JNIEnvP12_jshortArrayPhE",
+   "self_type" : "_ZTIPFPsP7_JNIEnvP12_jshortArrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8165,8 +7985,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPtP7_JNIEnvP11_jcharArrayPhE",
    "name" : "unsigned short *(*)(_JNIEnv *, _jcharArray *, unsigned char *)",
-   "referenced_type" : "type-433",
-   "self_type" : "type-432",
+   "referenced_type" : "_ZTIFPtP7_JNIEnvP11_jcharArrayPhE",
+   "self_type" : "_ZTIPFPtP7_JNIEnvP11_jcharArrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8174,8 +7994,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPvP7_JNIEnvP7_jarrayPhE",
    "name" : "void *(*)(_JNIEnv *, _jarray *, unsigned char *)",
-   "referenced_type" : "type-541",
-   "self_type" : "type-540",
+   "referenced_type" : "_ZTIFPvP7_JNIEnvP7_jarrayPhE",
+   "self_type" : "_ZTIPFPvP7_JNIEnvP7_jarrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8183,8 +8003,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPvP7_JNIEnvP8_jobjectE",
    "name" : "void *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-549",
-   "self_type" : "type-548",
+   "referenced_type" : "_ZTIFPvP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFPvP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8192,8 +8012,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPvS_E",
    "name" : "void *(*)(void *)",
-   "referenced_type" : "type-610",
-   "self_type" : "type-611",
+   "referenced_type" : "_ZTIFPvS_E",
+   "self_type" : "_ZTIPFPvS_E",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -8201,8 +8021,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPxP7_JNIEnvP11_jlongArrayPhE",
    "name" : "long long *(*)(_JNIEnv *, _jlongArray *, unsigned char *)",
-   "referenced_type" : "type-442",
-   "self_type" : "type-441",
+   "referenced_type" : "_ZTIFPxP7_JNIEnvP11_jlongArrayPhE",
+   "self_type" : "_ZTIPFPxP7_JNIEnvP11_jlongArrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8210,8 +8030,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "signed char (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-278",
-   "self_type" : "type-277",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8219,8 +8039,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "signed char (*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-275",
-   "self_type" : "type-274",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8228,8 +8048,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "signed char (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-273",
-   "self_type" : "type-272",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8237,8 +8057,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "signed char (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-333",
-   "self_type" : "type-332",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8246,8 +8066,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-107",
-   "self_type" : "type-106",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8255,8 +8075,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-104",
-   "self_type" : "type-103",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8264,8 +8084,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-102",
-   "self_type" : "type-101",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8273,8 +8093,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-177",
-   "self_type" : "type-176",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8282,8 +8102,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-174",
-   "self_type" : "type-173",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8291,8 +8111,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-172",
-   "self_type" : "type-171",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8300,8 +8120,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-234",
-   "self_type" : "type-233",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8309,8 +8129,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPKvjE",
    "name" : "bool (*)(const void *, unsigned int)",
-   "referenced_type" : "type-655",
-   "self_type" : "type-656",
+   "referenced_type" : "_ZTIFbPKvjE",
+   "self_type" : "_ZTIPFbPKvjE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8318,8 +8138,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviE",
    "name" : "bool (*)(void *, int)",
-   "referenced_type" : "type-634",
-   "self_type" : "type-635",
+   "referenced_type" : "_ZTIFbPviE",
+   "self_type" : "_ZTIPFbPviE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8327,8 +8147,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPDsE",
    "name" : "bool (*)(void *, int, char16_t **)",
-   "referenced_type" : "type-682",
-   "self_type" : "type-684",
+   "referenced_type" : "_ZTIFbPviPPDsE",
+   "self_type" : "_ZTIPFbPviPPDsE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8336,8 +8156,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPaE",
    "name" : "bool (*)(void *, int, signed char **)",
-   "referenced_type" : "type-685",
-   "self_type" : "type-687",
+   "referenced_type" : "_ZTIFbPviPPaE",
+   "self_type" : "_ZTIPFbPviPPaE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8345,8 +8165,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPcE",
    "name" : "bool (*)(void *, int, char **)",
-   "referenced_type" : "type-625",
-   "self_type" : "type-627",
+   "referenced_type" : "_ZTIFbPviPPcE",
+   "self_type" : "_ZTIPFbPviPPcE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8354,8 +8174,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPdE",
    "name" : "bool (*)(void *, int, double **)",
-   "referenced_type" : "type-676",
-   "self_type" : "type-678",
+   "referenced_type" : "_ZTIFbPviPPdE",
+   "self_type" : "_ZTIPFbPviPPdE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8363,8 +8183,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPfE",
    "name" : "bool (*)(void *, int, float **)",
-   "referenced_type" : "type-673",
-   "self_type" : "type-675",
+   "referenced_type" : "_ZTIFbPviPPfE",
+   "self_type" : "_ZTIPFbPviPPfE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8372,8 +8192,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPiE",
    "name" : "bool (*)(void *, int, int **)",
-   "referenced_type" : "type-659",
-   "self_type" : "type-661",
+   "referenced_type" : "_ZTIFbPviPPiE",
+   "self_type" : "_ZTIPFbPviPPiE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8381,8 +8201,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPjE",
    "name" : "bool (*)(void *, int, unsigned int **)",
-   "referenced_type" : "type-662",
-   "self_type" : "type-664",
+   "referenced_type" : "_ZTIFbPviPPjE",
+   "self_type" : "_ZTIPFbPviPPjE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8390,8 +8210,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPxE",
    "name" : "bool (*)(void *, int, long long **)",
-   "referenced_type" : "type-665",
-   "self_type" : "type-667",
+   "referenced_type" : "_ZTIFbPviPPxE",
+   "self_type" : "_ZTIPFbPviPPxE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8399,8 +8219,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPyE",
    "name" : "bool (*)(void *, int, unsigned long long **)",
-   "referenced_type" : "type-668",
-   "self_type" : "type-672",
+   "referenced_type" : "_ZTIFbPviPPyE",
+   "self_type" : "_ZTIPFbPviPPyE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8408,8 +8228,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPvjiPPcE",
    "name" : "bool (*)(void *, unsigned int, int, char **)",
-   "referenced_type" : "type-636",
-   "self_type" : "type-637",
+   "referenced_type" : "_ZTIFbPvjiPPcE",
+   "self_type" : "_ZTIPFbPvjiPPcE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8417,8 +8237,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-320",
-   "self_type" : "type-319",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8426,8 +8246,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-317",
-   "self_type" : "type-316",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8435,8 +8255,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-315",
-   "self_type" : "type-314",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8444,8 +8264,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-345",
-   "self_type" : "type-344",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8453,8 +8273,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-149",
-   "self_type" : "type-148",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8462,8 +8282,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-146",
-   "self_type" : "type-145",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8471,8 +8291,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-144",
-   "self_type" : "type-143",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8480,8 +8300,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-219",
-   "self_type" : "type-218",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8489,8 +8309,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-216",
-   "self_type" : "type-215",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8498,8 +8318,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-214",
-   "self_type" : "type-213",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8507,8 +8327,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-246",
-   "self_type" : "type-245",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8516,8 +8336,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "float (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-313",
-   "self_type" : "type-312",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8525,8 +8345,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "float (*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-310",
-   "self_type" : "type-309",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8534,8 +8354,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "float (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8543,8 +8363,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "float (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-343",
-   "self_type" : "type-342",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8552,8 +8372,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-142",
-   "self_type" : "type-141",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8561,8 +8381,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8570,8 +8390,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-137",
-   "self_type" : "type-136",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8579,8 +8399,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-212",
-   "self_type" : "type-211",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8588,8 +8408,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-209",
-   "self_type" : "type-208",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8597,8 +8417,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-207",
-   "self_type" : "type-206",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8606,8 +8426,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-244",
-   "self_type" : "type-243",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8615,8 +8435,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvE",
    "name" : "unsigned char (*)(_JNIEnv *)",
-   "referenced_type" : "type-545",
-   "self_type" : "type-544",
+   "referenced_type" : "_ZTIFhP7_JNIEnvE",
+   "self_type" : "_ZTIPFhP7_JNIEnvE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8624,8 +8444,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-271",
-   "self_type" : "type-270",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8633,8 +8453,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-268",
-   "self_type" : "type-267",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8642,8 +8462,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-266",
-   "self_type" : "type-265",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8651,8 +8471,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-331",
-   "self_type" : "type-330",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8660,8 +8480,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassS2_E",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jclass *)",
-   "referenced_type" : "type-43",
-   "self_type" : "type-42",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassS2_E",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassS2_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8669,8 +8489,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-100",
-   "self_type" : "type-99",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8678,8 +8498,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8687,8 +8507,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-95",
-   "self_type" : "type-94",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8696,8 +8516,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jclass *)",
-   "referenced_type" : "type-84",
-   "self_type" : "type-83",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8705,8 +8525,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-170",
-   "self_type" : "type-169",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8714,8 +8534,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-167",
-   "self_type" : "type-166",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8723,8 +8543,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-165",
-   "self_type" : "type-164",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8732,8 +8552,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-232",
-   "self_type" : "type-231",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8741,8 +8561,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectS2_E",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jobject *)",
-   "referenced_type" : "type-65",
-   "self_type" : "type-64",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectS2_E",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectS2_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8750,8 +8570,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7AParcelPKvjE",
    "name" : "int (*)(AParcel *, const void *, unsigned int)",
-   "referenced_type" : "type-638",
-   "self_type" : "type-639",
+   "referenced_type" : "_ZTIFiP7AParcelPKvjE",
+   "self_type" : "_ZTIPFiP7AParcelPKvjE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8759,8 +8579,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvE",
    "name" : "int (*)(_JNIEnv *)",
-   "referenced_type" : "type-15",
-   "self_type" : "type-14",
+   "referenced_type" : "_ZTIFiP7_JNIEnvE",
+   "self_type" : "_ZTIPFiP7_JNIEnvE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8768,8 +8588,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP11_jthrowableE",
    "name" : "int (*)(_JNIEnv *, _jthrowable *)",
-   "referenced_type" : "type-47",
-   "self_type" : "type-46",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP11_jthrowableE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP11_jthrowableE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8777,8 +8597,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jarrayE",
    "name" : "int (*)(_JNIEnv *, _jarray *)",
-   "referenced_type" : "type-384",
-   "self_type" : "type-383",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jarrayE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jarrayE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8786,8 +8606,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassE",
    "name" : "int (*)(_JNIEnv *, _jclass *)",
-   "referenced_type" : "type-516",
-   "self_type" : "type-515",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8795,8 +8615,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "int (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-299",
-   "self_type" : "type-298",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8804,8 +8624,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "int (*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-296",
-   "self_type" : "type-295",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8813,8 +8633,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "int (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-294",
-   "self_type" : "type-293",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8822,8 +8642,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "int (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-339",
-   "self_type" : "type-338",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8831,8 +8651,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
    "name" : "int (*)(_JNIEnv *, _jclass *, const JNINativeMethod *, int)",
-   "referenced_type" : "type-511",
-   "self_type" : "type-510",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8840,8 +8660,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassPKcE",
    "name" : "int (*)(_JNIEnv *, _jclass *, const char *)",
-   "referenced_type" : "type-51",
-   "self_type" : "type-50",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassPKcE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassPKcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8849,8 +8669,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectE",
    "name" : "int (*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-518",
-   "self_type" : "type-517",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8858,8 +8678,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-128",
-   "self_type" : "type-127",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8867,8 +8687,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-125",
-   "self_type" : "type-124",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8876,8 +8696,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-123",
-   "self_type" : "type-122",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8885,8 +8705,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-198",
-   "self_type" : "type-197",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8894,8 +8714,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-195",
-   "self_type" : "type-194",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8903,8 +8723,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-193",
-   "self_type" : "type-192",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8912,8 +8732,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-240",
-   "self_type" : "type-239",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8921,8 +8741,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jstringE",
    "name" : "int (*)(_JNIEnv *, _jstring *)",
-   "referenced_type" : "type-371",
-   "self_type" : "type-370",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jstringE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jstringE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8930,8 +8750,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvPP7_JavaVME",
    "name" : "int (*)(_JNIEnv *, _JavaVM **)",
-   "referenced_type" : "type-520",
-   "self_type" : "type-519",
+   "referenced_type" : "_ZTIFiP7_JNIEnvPP7_JavaVME",
+   "self_type" : "_ZTIPFiP7_JNIEnvPP7_JavaVME",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8939,8 +8759,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnviE",
    "name" : "int (*)(_JNIEnv *, int)",
-   "referenced_type" : "type-59",
-   "self_type" : "type-58",
+   "referenced_type" : "_ZTIFiP7_JNIEnviE",
+   "self_type" : "_ZTIPFiP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8948,8 +8768,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JavaVME",
    "name" : "int (*)(_JavaVM *)",
-   "referenced_type" : "type-528",
-   "self_type" : "type-527",
+   "referenced_type" : "_ZTIFiP7_JavaVME",
+   "self_type" : "_ZTIPFiP7_JavaVME",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8957,8 +8777,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JavaVMPP7_JNIEnvPvE",
    "name" : "int (*)(_JavaVM *, _JNIEnv **, void *)",
-   "referenced_type" : "type-530",
-   "self_type" : "type-529",
+   "referenced_type" : "_ZTIFiP7_JavaVMPP7_JNIEnvPvE",
+   "self_type" : "_ZTIPFiP7_JavaVMPP7_JNIEnvPvE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8966,8 +8786,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JavaVMPPviE",
    "name" : "int (*)(_JavaVM *, void **, int)",
-   "referenced_type" : "type-533",
-   "self_type" : "type-532",
+   "referenced_type" : "_ZTIFiP7_JavaVMPPviE",
+   "self_type" : "_ZTIPFiP7_JavaVMPPviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8975,8 +8795,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP8AIBinderiPPKcjE",
    "name" : "int (*)(AIBinder *, int, const char **, unsigned int)",
-   "referenced_type" : "type-593",
-   "self_type" : "type-595",
+   "referenced_type" : "_ZTIFiP8AIBinderiPPKcjE",
+   "self_type" : "_ZTIPFiP8AIBinderiPPKcjE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -8984,8 +8804,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP8AIBinderjPK7AParcelPS1_E",
    "name" : "int (*)(AIBinder *, unsigned int, const AParcel *, AParcel *)",
-   "referenced_type" : "type-590",
-   "self_type" : "type-589",
+   "referenced_type" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
+   "self_type" : "_ZTIPFiP8AIBinderjPK7AParcelPS1_E",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -8993,8 +8813,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiPK7AParcelPvjE",
    "name" : "int (*)(const AParcel *, void *, unsigned int)",
-   "referenced_type" : "type-640",
-   "self_type" : "type-644",
+   "referenced_type" : "_ZTIFiPK7AParcelPvjE",
+   "self_type" : "_ZTIPFiPK7AParcelPvjE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -9002,8 +8822,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "short (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-292",
-   "self_type" : "type-291",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9011,8 +8831,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "short (*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-289",
-   "self_type" : "type-288",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9020,8 +8840,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "short (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-287",
-   "self_type" : "type-286",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9029,8 +8849,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "short (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-337",
-   "self_type" : "type-336",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9038,8 +8858,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-121",
-   "self_type" : "type-120",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9047,8 +8867,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-118",
-   "self_type" : "type-117",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9056,8 +8876,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-116",
-   "self_type" : "type-115",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9065,8 +8885,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-191",
-   "self_type" : "type-190",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9074,8 +8894,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-188",
-   "self_type" : "type-187",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9083,8 +8903,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-186",
-   "self_type" : "type-185",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9092,8 +8912,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-238",
-   "self_type" : "type-237",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9101,8 +8921,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "unsigned short (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-285",
-   "self_type" : "type-284",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9110,8 +8930,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "unsigned short (*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-282",
-   "self_type" : "type-281",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9119,8 +8939,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "unsigned short (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-280",
-   "self_type" : "type-279",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9128,8 +8948,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "unsigned short (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-335",
-   "self_type" : "type-334",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9137,8 +8957,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-114",
-   "self_type" : "type-113",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9146,8 +8966,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-111",
-   "self_type" : "type-110",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9155,8 +8975,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-109",
-   "self_type" : "type-108",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9164,8 +8984,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-184",
-   "self_type" : "type-183",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9173,8 +8993,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9182,8 +9002,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-179",
-   "self_type" : "type-178",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9191,8 +9011,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-236",
-   "self_type" : "type-235",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9200,8 +9020,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvE",
    "name" : "void (*)(_JNIEnv *)",
-   "referenced_type" : "type-55",
-   "self_type" : "type-54",
+   "referenced_type" : "_ZTIFvP7_JNIEnvE",
+   "self_type" : "_ZTIPFvP7_JNIEnvE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9209,8 +9029,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP10_jintArrayPiiE",
    "name" : "void (*)(_JNIEnv *, _jintArray *, int *, int)",
-   "referenced_type" : "type-459",
-   "self_type" : "type-458",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayPiiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayPiiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9218,8 +9038,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPKiE",
    "name" : "void (*)(_JNIEnv *, _jintArray *, int, int, const int *)",
-   "referenced_type" : "type-495",
-   "self_type" : "type-494",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPKiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPKiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9227,8 +9047,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPiE",
    "name" : "void (*)(_JNIEnv *, _jintArray *, int, int, int *)",
-   "referenced_type" : "type-475",
-   "self_type" : "type-474",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9236,8 +9056,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayPaiE",
    "name" : "void (*)(_JNIEnv *, _jbyteArray *, signed char *, int)",
-   "referenced_type" : "type-453",
-   "self_type" : "type-452",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayPaiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayPaiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9245,8 +9065,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPKaE",
    "name" : "void (*)(_JNIEnv *, _jbyteArray *, int, int, const signed char *)",
-   "referenced_type" : "type-487",
-   "self_type" : "type-486",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPKaE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPKaE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9254,8 +9074,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPaE",
    "name" : "void (*)(_JNIEnv *, _jbyteArray *, int, int, signed char *)",
-   "referenced_type" : "type-469",
-   "self_type" : "type-468",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPaE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPaE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9263,8 +9083,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jcharArrayPtiE",
    "name" : "void (*)(_JNIEnv *, _jcharArray *, unsigned short *, int)",
-   "referenced_type" : "type-455",
-   "self_type" : "type-454",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayPtiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayPtiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9272,8 +9092,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPKtE",
    "name" : "void (*)(_JNIEnv *, _jcharArray *, int, int, const unsigned short *)",
-   "referenced_type" : "type-489",
-   "self_type" : "type-488",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPKtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPKtE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9281,8 +9101,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPtE",
    "name" : "void (*)(_JNIEnv *, _jcharArray *, int, int, unsigned short *)",
-   "referenced_type" : "type-471",
-   "self_type" : "type-470",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPtE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9290,8 +9110,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jlongArrayPxiE",
    "name" : "void (*)(_JNIEnv *, _jlongArray *, long long *, int)",
-   "referenced_type" : "type-461",
-   "self_type" : "type-460",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayPxiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayPxiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9299,8 +9119,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPKxE",
    "name" : "void (*)(_JNIEnv *, _jlongArray *, int, int, const long long *)",
-   "referenced_type" : "type-499",
-   "self_type" : "type-498",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPKxE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPKxE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9308,8 +9128,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPxE",
    "name" : "void (*)(_JNIEnv *, _jlongArray *, int, int, long long *)",
-   "referenced_type" : "type-477",
-   "self_type" : "type-476",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPxE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPxE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9317,8 +9137,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayPfiE",
    "name" : "void (*)(_JNIEnv *, _jfloatArray *, float *, int)",
-   "referenced_type" : "type-463",
-   "self_type" : "type-462",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayPfiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayPfiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9326,8 +9146,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPKfE",
    "name" : "void (*)(_JNIEnv *, _jfloatArray *, int, int, const float *)",
-   "referenced_type" : "type-503",
-   "self_type" : "type-502",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPKfE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPKfE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9335,8 +9155,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPfE",
    "name" : "void (*)(_JNIEnv *, _jfloatArray *, int, int, float *)",
-   "referenced_type" : "type-479",
-   "self_type" : "type-478",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPfE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPfE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9344,8 +9164,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jshortArrayPsiE",
    "name" : "void (*)(_JNIEnv *, _jshortArray *, short *, int)",
-   "referenced_type" : "type-457",
-   "self_type" : "type-456",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayPsiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayPsiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9353,8 +9173,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPKsE",
    "name" : "void (*)(_JNIEnv *, _jshortArray *, int, int, const short *)",
-   "referenced_type" : "type-491",
-   "self_type" : "type-490",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPKsE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPKsE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9362,8 +9182,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPsE",
    "name" : "void (*)(_JNIEnv *, _jshortArray *, int, int, short *)",
-   "referenced_type" : "type-473",
-   "self_type" : "type-472",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPsE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPsE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9371,8 +9191,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayPdiE",
    "name" : "void (*)(_JNIEnv *, _jdoubleArray *, double *, int)",
-   "referenced_type" : "type-465",
-   "self_type" : "type-464",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayPdiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayPdiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9380,8 +9200,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
    "name" : "void (*)(_JNIEnv *, _jdoubleArray *, int, int, const double *)",
-   "referenced_type" : "type-507",
-   "self_type" : "type-506",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9389,8 +9209,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPdE",
    "name" : "void (*)(_JNIEnv *, _jdoubleArray *, int, int, double *)",
-   "referenced_type" : "type-481",
-   "self_type" : "type-480",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPdE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPdE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9398,8 +9218,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
    "name" : "void (*)(_JNIEnv *, _jobjectArray *, int, _jobject *)",
-   "referenced_type" : "type-394",
-   "self_type" : "type-393",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9407,8 +9227,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayPhiE",
    "name" : "void (*)(_JNIEnv *, _jbooleanArray *, unsigned char *, int)",
-   "referenced_type" : "type-451",
-   "self_type" : "type-450",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayPhiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayPhiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9416,8 +9236,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
    "name" : "void (*)(_JNIEnv *, _jbooleanArray *, int, int, const unsigned char *)",
-   "referenced_type" : "type-483",
-   "self_type" : "type-482",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9425,8 +9245,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPhE",
    "name" : "void (*)(_JNIEnv *, _jbooleanArray *, int, int, unsigned char *)",
-   "referenced_type" : "type-467",
-   "self_type" : "type-466",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPhE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9434,8 +9254,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jarrayPviE",
    "name" : "void (*)(_JNIEnv *, _jarray *, void *, int)",
-   "referenced_type" : "type-543",
-   "self_type" : "type-542",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jarrayPviE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jarrayPviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9443,8 +9263,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-327",
-   "self_type" : "type-326",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9452,8 +9272,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-324",
-   "self_type" : "type-323",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9461,8 +9281,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-322",
-   "self_type" : "type-321",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9470,8 +9290,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, _jobject *)",
-   "referenced_type" : "type-347",
-   "self_type" : "type-346",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9479,8 +9299,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, signed char)",
-   "referenced_type" : "type-351",
-   "self_type" : "type-350",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9488,8 +9308,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, double)",
-   "referenced_type" : "type-363",
-   "self_type" : "type-362",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9497,8 +9317,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, float)",
-   "referenced_type" : "type-361",
-   "self_type" : "type-360",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9506,8 +9326,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, unsigned char)",
-   "referenced_type" : "type-349",
-   "self_type" : "type-348",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9515,8 +9335,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, int)",
-   "referenced_type" : "type-357",
-   "self_type" : "type-356",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9524,8 +9344,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, short)",
-   "referenced_type" : "type-355",
-   "self_type" : "type-354",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9533,8 +9353,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, unsigned short)",
-   "referenced_type" : "type-353",
-   "self_type" : "type-352",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9542,8 +9362,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDxE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, long long)",
-   "referenced_type" : "type-359",
-   "self_type" : "type-358",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDxE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDxE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9551,8 +9371,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectE",
    "name" : "void (*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9560,8 +9380,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-156",
-   "self_type" : "type-155",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9569,8 +9389,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-153",
-   "self_type" : "type-152",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9578,8 +9398,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-151",
-   "self_type" : "type-150",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9587,8 +9407,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-226",
-   "self_type" : "type-225",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9596,8 +9416,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-223",
-   "self_type" : "type-222",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9605,8 +9425,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-221",
-   "self_type" : "type-220",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9614,8 +9434,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, _jobject *)",
-   "referenced_type" : "type-248",
-   "self_type" : "type-247",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9623,8 +9443,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, signed char)",
-   "referenced_type" : "type-252",
-   "self_type" : "type-251",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9632,8 +9452,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, double)",
-   "referenced_type" : "type-264",
-   "self_type" : "type-263",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9641,8 +9461,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, float)",
-   "referenced_type" : "type-262",
-   "self_type" : "type-261",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9650,8 +9470,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, unsigned char)",
-   "referenced_type" : "type-250",
-   "self_type" : "type-249",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9659,8 +9479,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, int)",
-   "referenced_type" : "type-258",
-   "self_type" : "type-257",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9668,8 +9488,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, short)",
-   "referenced_type" : "type-256",
-   "self_type" : "type-255",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9677,8 +9497,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, unsigned short)",
-   "referenced_type" : "type-254",
-   "self_type" : "type-253",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9686,8 +9506,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDxE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, long long)",
-   "referenced_type" : "type-260",
-   "self_type" : "type-259",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDxE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDxE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9695,8 +9515,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jstringPKcE",
    "name" : "void (*)(_JNIEnv *, _jstring *, const char *)",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringPKcE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9704,8 +9524,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jstringPKtE",
    "name" : "void (*)(_JNIEnv *, _jstring *, const unsigned short *)",
-   "referenced_type" : "type-376",
-   "self_type" : "type-375",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringPKtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKtE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9713,8 +9533,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jstringiiPcE",
    "name" : "void (*)(_JNIEnv *, _jstring *, int, int, char *)",
-   "referenced_type" : "type-538",
-   "self_type" : "type-537",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPcE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jstringiiPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9722,8 +9542,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jstringiiPtE",
    "name" : "void (*)(_JNIEnv *, _jstring *, int, int, unsigned short *)",
-   "referenced_type" : "type-536",
-   "self_type" : "type-535",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jstringiiPtE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9731,8 +9551,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvPKcE",
    "name" : "void (*)(_JNIEnv *, const char *)",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "_ZTIFvP7_JNIEnvPKcE",
+   "self_type" : "_ZTIPFvP7_JNIEnvPKcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9740,8 +9560,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvPvE",
    "name" : "void (*)(void *)",
-   "referenced_type" : "type-602",
-   "self_type" : "type-618",
+   "referenced_type" : "_ZTIFvPvE",
+   "self_type" : "_ZTIPFvPvE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9749,8 +9569,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvPvjbE",
    "name" : "void (*)(void *, unsigned int, bool)",
-   "referenced_type" : "type-679",
-   "self_type" : "type-680",
+   "referenced_type" : "_ZTIFvPvjbE",
+   "self_type" : "_ZTIPFvPvjbE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -9758,8 +9578,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "long long (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-306",
-   "self_type" : "type-305",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9767,8 +9587,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "long long (*)(_JNIEnv *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-303",
-   "self_type" : "type-302",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9776,8 +9596,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "long long (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-301",
-   "self_type" : "type-300",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9785,8 +9605,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "long long (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-341",
-   "self_type" : "type-340",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9794,8 +9614,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectE",
    "name" : "long long (*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-551",
-   "self_type" : "type-550",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9803,8 +9623,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "long long (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-135",
-   "self_type" : "type-134",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9812,8 +9632,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "name" : "long long (*)(_JNIEnv *, _jobject *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-132",
-   "self_type" : "type-131",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9821,8 +9641,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "long long (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-130",
-   "self_type" : "type-129",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9830,8 +9650,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "long long (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-205",
-   "self_type" : "type-204",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9839,8 +9659,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "name" : "long long (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, std::__va_list)",
-   "referenced_type" : "type-202",
-   "self_type" : "type-201",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9848,8 +9668,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "long long (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-200",
-   "self_type" : "type-199",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9857,8 +9677,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "long long (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-242",
-   "self_type" : "type-241",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9866,8 +9686,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK14AIBinder_Class",
    "name" : "const AIBinder_Class *",
-   "referenced_type" : "type-596",
-   "self_type" : "type-598",
+   "referenced_type" : "_ZTIK14AIBinder_Class",
+   "self_type" : "_ZTIPK14AIBinder_Class",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9875,8 +9695,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK14AIBinder_Class",
    "name" : "const AIBinder_Class *",
-   "referenced_type" : "type-706",
-   "self_type" : "type-708",
+   "referenced_type" : "_ZTIK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9884,8 +9704,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK15JNINativeMethod",
    "name" : "const JNINativeMethod *",
-   "referenced_type" : "type-513",
-   "self_type" : "type-512",
+   "referenced_type" : "_ZTIK15JNINativeMethod",
+   "self_type" : "_ZTIPK15JNINativeMethod",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9893,8 +9713,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK18JNIInvokeInterface",
    "name" : "const JNIInvokeInterface *",
-   "referenced_type" : "type-525",
-   "self_type" : "type-524",
+   "referenced_type" : "_ZTIK18JNIInvokeInterface",
+   "self_type" : "_ZTIPK18JNIInvokeInterface",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9902,8 +9722,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK18JNINativeInterface",
    "name" : "const JNINativeInterface *",
-   "referenced_type" : "type-10",
-   "self_type" : "type-9",
+   "referenced_type" : "_ZTIK18JNINativeInterface",
+   "self_type" : "_ZTIPK18JNINativeInterface",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9911,8 +9731,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK6jvalue",
    "name" : "const jvalue *",
-   "referenced_type" : "type-74",
-   "self_type" : "type-73",
+   "referenced_type" : "_ZTIK6jvalue",
+   "self_type" : "_ZTIPK6jvalue",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9920,17 +9740,17 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AParcel",
    "name" : "const AParcel *",
-   "referenced_type" : "type-566",
-   "self_type" : "type-568",
+   "referenced_type" : "_ZTIK7AParcel",
+   "self_type" : "_ZTIPK7AParcel",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AParcel",
    "name" : "const AParcel *",
-   "referenced_type" : "type-585",
-   "self_type" : "type-584",
+   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9938,26 +9758,17 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AParcel",
    "name" : "const AParcel *",
-   "referenced_type" : "type-642",
-   "self_type" : "type-641",
+   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
+   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "type-701",
-   "self_type" : "type-703",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AStatus",
    "name" : "const AStatus *",
-   "referenced_type" : "type-558",
-   "self_type" : "type-560",
+   "referenced_type" : "_ZTIK7AStatus",
+   "self_type" : "_ZTIPK7AStatus",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -9965,17 +9776,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AStatus",
    "name" : "const AStatus *",
-   "referenced_type" : "type-576",
-   "self_type" : "type-578",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AStatus",
-   "name" : "const AStatus *",
-   "referenced_type" : "type-619",
-   "self_type" : "type-621",
+   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
+   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -9983,8 +9785,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AStatus",
    "name" : "const AStatus *",
-   "referenced_type" : "type-692",
-   "self_type" : "type-694",
+   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
@@ -9992,8 +9794,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK8AIBinder",
    "name" : "const AIBinder *",
-   "referenced_type" : "type-600",
-   "self_type" : "type-603",
+   "referenced_type" : "_ZTIK8AIBinder",
+   "self_type" : "_ZTIPK8AIBinder",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10001,8 +9803,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK8AIBinder",
    "name" : "const AIBinder *",
-   "referenced_type" : "type-709",
-   "self_type" : "type-711",
+   "referenced_type" : "_ZTIK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10010,8 +9812,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKDs",
    "name" : "const char16_t *",
-   "referenced_type" : "type-657",
-   "self_type" : "type-658",
+   "referenced_type" : "_ZTIKDs",
+   "self_type" : "_ZTIPKDs",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10019,8 +9821,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKa",
    "name" : "const signed char *",
-   "referenced_type" : "type-25",
-   "self_type" : "type-24",
+   "referenced_type" : "_ZTIKa",
+   "self_type" : "_ZTIPKa",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10028,8 +9830,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKc",
    "name" : "const char *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
+   "referenced_type" : "_ZTIKc",
+   "self_type" : "_ZTIPKc",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10037,8 +9839,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKd",
    "name" : "const double *",
-   "referenced_type" : "type-509",
-   "self_type" : "type-508",
+   "referenced_type" : "_ZTIKd",
+   "self_type" : "_ZTIPKd",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10046,8 +9848,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKf",
    "name" : "const float *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-504",
+   "referenced_type" : "_ZTIKf",
+   "self_type" : "_ZTIPKf",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10055,8 +9857,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKh",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-485",
-   "self_type" : "type-484",
+   "referenced_type" : "_ZTIKh",
+   "self_type" : "_ZTIPKh",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10064,8 +9866,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKi",
    "name" : "const int *",
-   "referenced_type" : "type-497",
-   "self_type" : "type-496",
+   "referenced_type" : "_ZTIKi",
+   "self_type" : "_ZTIPKi",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10073,8 +9875,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKj",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-651",
-   "self_type" : "type-652",
+   "referenced_type" : "_ZTIKj",
+   "self_type" : "_ZTIPKj",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10082,8 +9884,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKs",
    "name" : "const short *",
-   "referenced_type" : "type-493",
-   "self_type" : "type-492",
+   "referenced_type" : "_ZTIKs",
+   "self_type" : "_ZTIPKs",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10091,8 +9893,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKt",
    "name" : "const unsigned short *",
-   "referenced_type" : "type-369",
-   "self_type" : "type-368",
+   "referenced_type" : "_ZTIKt",
+   "self_type" : "_ZTIPKt",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10100,8 +9902,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKv",
    "name" : "const void *",
-   "referenced_type" : "type-628",
-   "self_type" : "type-629",
+   "referenced_type" : "_ZTIKv",
+   "self_type" : "_ZTIPKv",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10109,8 +9911,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKx",
    "name" : "const long long *",
-   "referenced_type" : "type-501",
-   "self_type" : "type-500",
+   "referenced_type" : "_ZTIKx",
+   "self_type" : "_ZTIPKx",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10118,8 +9920,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKy",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-653",
-   "self_type" : "type-654",
+   "referenced_type" : "_ZTIKy",
+   "self_type" : "_ZTIPKy",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10127,8 +9929,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP7AParcel",
    "name" : "AParcel **",
-   "referenced_type" : "type-587",
-   "self_type" : "type-606",
+   "referenced_type" : "_ZTIP7AParcel",
+   "self_type" : "_ZTIPP7AParcel",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10136,8 +9938,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP7AParcel",
    "name" : "AParcel **",
-   "referenced_type" : "type-704",
-   "self_type" : "type-714",
+   "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10145,8 +9947,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP7AStatus",
    "name" : "AStatus **",
-   "referenced_type" : "type-561",
-   "self_type" : "type-563",
+   "referenced_type" : "_ZTIP7AStatus",
+   "self_type" : "_ZTIPP7AStatus",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10154,8 +9956,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP7AStatus",
    "name" : "AStatus **",
-   "referenced_type" : "type-622",
-   "self_type" : "type-624",
+   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
+   "self_type" : "_ZTIPP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10163,8 +9965,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP7_JNIEnv",
    "name" : "_JNIEnv **",
-   "referenced_type" : "type-7",
-   "self_type" : "type-531",
+   "referenced_type" : "_ZTIP7_JNIEnv",
+   "self_type" : "_ZTIPP7_JNIEnv",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10172,8 +9974,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP7_JavaVM",
    "name" : "_JavaVM **",
-   "referenced_type" : "type-522",
-   "self_type" : "type-521",
+   "referenced_type" : "_ZTIP7_JavaVM",
+   "self_type" : "_ZTIPP7_JavaVM",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10181,17 +9983,17 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP8AIBinder",
    "name" : "AIBinder **",
-   "referenced_type" : "type-569",
-   "self_type" : "type-571",
+   "referenced_type" : "_ZTIP8AIBinder",
+   "self_type" : "_ZTIPP8AIBinder",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP8AIBinder",
    "name" : "AIBinder **",
-   "referenced_type" : "type-591",
-   "self_type" : "type-609",
+   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10199,26 +10001,17 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP8AIBinder",
    "name" : "AIBinder **",
-   "referenced_type" : "type-670",
-   "self_type" : "type-681",
+   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
+   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_arm_armv8-a_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "type-699",
-   "self_type" : "type-717",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPDs",
    "name" : "char16_t **",
-   "referenced_type" : "type-650",
-   "self_type" : "type-683",
+   "referenced_type" : "_ZTIPDs",
+   "self_type" : "_ZTIPPDs",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10226,8 +10019,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPKc",
    "name" : "const char **",
-   "referenced_type" : "type-21",
-   "self_type" : "type-594",
+   "referenced_type" : "_ZTIPKc",
+   "self_type" : "_ZTIPPKc",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10235,8 +10028,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPa",
    "name" : "signed char **",
-   "referenced_type" : "type-431",
-   "self_type" : "type-686",
+   "referenced_type" : "_ZTIPa",
+   "self_type" : "_ZTIPPa",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10244,8 +10037,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPc",
    "name" : "char **",
-   "referenced_type" : "type-539",
-   "self_type" : "type-626",
+   "referenced_type" : "_ZTIPc",
+   "self_type" : "_ZTIPPc",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10253,8 +10046,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPd",
    "name" : "double **",
-   "referenced_type" : "type-449",
-   "self_type" : "type-677",
+   "referenced_type" : "_ZTIPd",
+   "self_type" : "_ZTIPPd",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10262,8 +10055,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPf",
    "name" : "float **",
-   "referenced_type" : "type-446",
-   "self_type" : "type-674",
+   "referenced_type" : "_ZTIPf",
+   "self_type" : "_ZTIPPf",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10271,8 +10064,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPi",
    "name" : "int **",
-   "referenced_type" : "type-440",
-   "self_type" : "type-660",
+   "referenced_type" : "_ZTIPi",
+   "self_type" : "_ZTIPPi",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10280,8 +10073,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPj",
    "name" : "unsigned int **",
-   "referenced_type" : "type-647",
-   "self_type" : "type-663",
+   "referenced_type" : "_ZTIPj",
+   "self_type" : "_ZTIPPj",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10289,8 +10082,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPv",
    "name" : "void **",
-   "referenced_type" : "type-12",
-   "self_type" : "type-534",
+   "referenced_type" : "_ZTIPv",
+   "self_type" : "_ZTIPPv",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10298,8 +10091,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPx",
    "name" : "long long **",
-   "referenced_type" : "type-443",
-   "self_type" : "type-666",
+   "referenced_type" : "_ZTIPx",
+   "self_type" : "_ZTIPPx",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10307,8 +10100,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPy",
    "name" : "unsigned long long **",
-   "referenced_type" : "type-648",
-   "self_type" : "type-669",
+   "referenced_type" : "_ZTIPy",
+   "self_type" : "_ZTIPPy",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10316,8 +10109,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPa",
    "name" : "signed char *",
-   "referenced_type" : "type-26",
-   "self_type" : "type-431",
+   "referenced_type" : "_ZTIa",
+   "self_type" : "_ZTIPa",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10325,8 +10118,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPb",
    "name" : "bool *",
-   "referenced_type" : "type-599",
-   "self_type" : "type-649",
+   "referenced_type" : "_ZTIb",
+   "self_type" : "_ZTIPb",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10334,8 +10127,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPc",
    "name" : "char *",
-   "referenced_type" : "type-23",
-   "self_type" : "type-539",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIPc",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10343,8 +10136,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPd",
    "name" : "double *",
-   "referenced_type" : "type-80",
-   "self_type" : "type-449",
+   "referenced_type" : "_ZTId",
+   "self_type" : "_ZTIPd",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10352,8 +10145,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPf",
    "name" : "float *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-446",
+   "referenced_type" : "_ZTIf",
+   "self_type" : "_ZTIPf",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10361,8 +10154,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPh",
    "name" : "unsigned char *",
-   "referenced_type" : "type-39",
-   "self_type" : "type-374",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIPh",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10370,8 +10163,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPi",
    "name" : "int *",
-   "referenced_type" : "type-16",
-   "self_type" : "type-440",
+   "referenced_type" : "_ZTIi",
+   "self_type" : "_ZTIPi",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10379,8 +10172,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPj",
    "name" : "unsigned int *",
-   "referenced_type" : "type-555",
-   "self_type" : "type-647",
+   "referenced_type" : "_ZTIj",
+   "self_type" : "_ZTIPj",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10388,8 +10181,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPs",
    "name" : "short *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-437",
+   "referenced_type" : "_ZTIs",
+   "self_type" : "_ZTIPs",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10397,8 +10190,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPt",
    "name" : "unsigned short *",
-   "referenced_type" : "type-76",
-   "self_type" : "type-434",
+   "referenced_type" : "_ZTIt",
+   "self_type" : "_ZTIPt",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10406,8 +10199,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPv",
    "name" : "void *",
-   "referenced_type" : "type-13",
-   "self_type" : "type-12",
+   "referenced_type" : "_ZTIv",
+   "self_type" : "_ZTIPv",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10415,8 +10208,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPx",
    "name" : "long long *",
-   "referenced_type" : "type-78",
-   "self_type" : "type-443",
+   "referenced_type" : "_ZTIx",
+   "self_type" : "_ZTIPx",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10424,8 +10217,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPy",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-645",
-   "self_type" : "type-648",
+   "referenced_type" : "_ZTIy",
+   "self_type" : "_ZTIPy",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   }
@@ -10437,18 +10230,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK14AIBinder_Class",
    "name" : "const AIBinder_Class",
-   "referenced_type" : "type-597",
-   "self_type" : "type-596",
-   "size" : 20,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK14AIBinder_Class",
-   "name" : "const AIBinder_Class",
-   "referenced_type" : "type-707",
-   "self_type" : "type-706",
+   "referenced_type" : "_ZTI14AIBinder_Class",
+   "self_type" : "_ZTIK14AIBinder_Class",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10457,8 +10240,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK15JNINativeMethod",
    "name" : "const JNINativeMethod",
-   "referenced_type" : "type-514",
-   "self_type" : "type-513",
+   "referenced_type" : "_ZTI15JNINativeMethod",
+   "self_type" : "_ZTIK15JNINativeMethod",
    "size" : 12,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10467,8 +10250,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK18JNIInvokeInterface",
    "name" : "const JNIInvokeInterface",
-   "referenced_type" : "type-526",
-   "self_type" : "type-525",
+   "referenced_type" : "_ZTI18JNIInvokeInterface",
+   "self_type" : "_ZTIK18JNIInvokeInterface",
    "size" : 32,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10477,8 +10260,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK18JNINativeInterface",
    "name" : "const JNINativeInterface",
-   "referenced_type" : "type-11",
-   "self_type" : "type-10",
+   "referenced_type" : "_ZTI18JNINativeInterface",
+   "self_type" : "_ZTIK18JNINativeInterface",
    "size" : 932,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10487,8 +10270,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK6jvalue",
    "name" : "const jvalue",
-   "referenced_type" : "type-75",
-   "self_type" : "type-74",
+   "referenced_type" : "_ZTI6jvalue",
+   "self_type" : "_ZTIK6jvalue",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10497,38 +10280,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK7AParcel",
    "name" : "const AParcel",
-   "referenced_type" : "type-567",
-   "self_type" : "type-566",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AParcel",
-   "name" : "const AParcel",
-   "referenced_type" : "type-586",
-   "self_type" : "type-585",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AParcel",
-   "name" : "const AParcel",
-   "referenced_type" : "type-643",
-   "self_type" : "type-642",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AParcel",
-   "name" : "const AParcel",
-   "referenced_type" : "type-702",
-   "self_type" : "type-701",
+   "referenced_type" : "_ZTI7AParcel",
+   "self_type" : "_ZTIK7AParcel",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10537,58 +10290,18 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK7AStatus",
    "name" : "const AStatus",
-   "referenced_type" : "type-559",
-   "self_type" : "type-558",
+   "referenced_type" : "_ZTI7AStatus",
+   "self_type" : "_ZTIK7AStatus",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIK7AStatus",
-   "name" : "const AStatus",
-   "referenced_type" : "type-577",
-   "self_type" : "type-576",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AStatus",
-   "name" : "const AStatus",
-   "referenced_type" : "type-620",
-   "self_type" : "type-619",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AStatus",
-   "name" : "const AStatus",
-   "referenced_type" : "type-693",
-   "self_type" : "type-692",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK8AIBinder",
-   "name" : "const AIBinder",
-   "referenced_type" : "type-601",
-   "self_type" : "type-600",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIK8AIBinder",
    "name" : "const AIBinder",
-   "referenced_type" : "type-710",
-   "self_type" : "type-709",
+   "referenced_type" : "_ZTI8AIBinder",
+   "self_type" : "_ZTIK8AIBinder",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10597,8 +10310,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKDs",
    "name" : "const char16_t",
-   "referenced_type" : "type-646",
-   "self_type" : "type-657",
+   "referenced_type" : "_ZTIDs",
+   "self_type" : "_ZTIKDs",
    "size" : 2,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10607,8 +10320,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKa",
    "name" : "const signed char",
-   "referenced_type" : "type-26",
-   "self_type" : "type-25",
+   "referenced_type" : "_ZTIa",
+   "self_type" : "_ZTIKa",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10617,8 +10330,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKc",
    "name" : "const char",
-   "referenced_type" : "type-23",
-   "self_type" : "type-22",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIKc",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10627,8 +10340,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKd",
    "name" : "const double",
-   "referenced_type" : "type-80",
-   "self_type" : "type-509",
+   "referenced_type" : "_ZTId",
+   "self_type" : "_ZTIKd",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10637,8 +10350,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKf",
    "name" : "const float",
-   "referenced_type" : "type-79",
-   "self_type" : "type-505",
+   "referenced_type" : "_ZTIf",
+   "self_type" : "_ZTIKf",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10647,8 +10360,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKh",
    "name" : "const unsigned char",
-   "referenced_type" : "type-39",
-   "self_type" : "type-485",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIKh",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10657,8 +10370,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKi",
    "name" : "const int",
-   "referenced_type" : "type-16",
-   "self_type" : "type-497",
+   "referenced_type" : "_ZTIi",
+   "self_type" : "_ZTIKi",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10667,8 +10380,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKj",
    "name" : "const unsigned int",
-   "referenced_type" : "type-555",
-   "self_type" : "type-651",
+   "referenced_type" : "_ZTIj",
+   "self_type" : "_ZTIKj",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10677,8 +10390,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKs",
    "name" : "const short",
-   "referenced_type" : "type-77",
-   "self_type" : "type-493",
+   "referenced_type" : "_ZTIs",
+   "self_type" : "_ZTIKs",
    "size" : 2,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10687,8 +10400,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKt",
    "name" : "const unsigned short",
-   "referenced_type" : "type-76",
-   "self_type" : "type-369",
+   "referenced_type" : "_ZTIt",
+   "self_type" : "_ZTIKt",
    "size" : 2,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10696,8 +10409,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKv",
    "name" : "const void",
-   "referenced_type" : "type-13",
-   "self_type" : "type-628",
+   "referenced_type" : "_ZTIv",
+   "self_type" : "_ZTIKv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -10705,8 +10418,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKx",
    "name" : "const long long",
-   "referenced_type" : "type-78",
-   "self_type" : "type-501",
+   "referenced_type" : "_ZTIx",
+   "self_type" : "_ZTIKx",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10715,8 +10428,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKy",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-645",
-   "self_type" : "type-653",
+   "referenced_type" : "_ZTIy",
+   "self_type" : "_ZTIKy",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   }
@@ -10728,14 +10441,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI10_jintArray",
    "name" : "_jintArray",
    "record_kind" : "class",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "_ZTI10_jintArray",
+   "self_type" : "_ZTI10_jintArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10744,14 +10457,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI11_jbyteArray",
    "name" : "_jbyteArray",
    "record_kind" : "class",
-   "referenced_type" : "type-402",
-   "self_type" : "type-402",
+   "referenced_type" : "_ZTI11_jbyteArray",
+   "self_type" : "_ZTI11_jbyteArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10760,14 +10473,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI11_jcharArray",
    "name" : "_jcharArray",
    "record_kind" : "class",
-   "referenced_type" : "type-406",
-   "self_type" : "type-406",
+   "referenced_type" : "_ZTI11_jcharArray",
+   "self_type" : "_ZTI11_jcharArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10776,14 +10489,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI11_jlongArray",
    "name" : "_jlongArray",
    "record_kind" : "class",
-   "referenced_type" : "type-418",
-   "self_type" : "type-418",
+   "referenced_type" : "_ZTI11_jlongArray",
+   "self_type" : "_ZTI11_jlongArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10792,14 +10505,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTI8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI11_jthrowable",
    "name" : "_jthrowable",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "_ZTI11_jthrowable",
+   "self_type" : "_ZTI11_jthrowable",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10809,18 +10522,18 @@
    [
     {
      "field_name" : "optionString",
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "field_name" : "extraInfo",
      "field_offset" : 32,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
    "linker_set_key" : "_ZTI12JavaVMOption",
    "name" : "JavaVMOption",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
+   "referenced_type" : "_ZTI12JavaVMOption",
+   "self_type" : "_ZTI12JavaVMOption",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10829,14 +10542,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI12_jfloatArray",
    "name" : "_jfloatArray",
    "record_kind" : "class",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
+   "referenced_type" : "_ZTI12_jfloatArray",
+   "self_type" : "_ZTI12_jfloatArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10845,14 +10558,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI12_jshortArray",
    "name" : "_jshortArray",
    "record_kind" : "class",
-   "referenced_type" : "type-410",
-   "self_type" : "type-410",
+   "referenced_type" : "_ZTI12_jshortArray",
+   "self_type" : "_ZTI12_jshortArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10861,14 +10574,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI13_jdoubleArray",
    "name" : "_jdoubleArray",
    "record_kind" : "class",
-   "referenced_type" : "type-426",
-   "self_type" : "type-426",
+   "referenced_type" : "_ZTI13_jdoubleArray",
+   "self_type" : "_ZTI13_jdoubleArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10877,14 +10590,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI13_jobjectArray",
    "name" : "_jobjectArray",
    "record_kind" : "class",
-   "referenced_type" : "type-390",
-   "self_type" : "type-390",
+   "referenced_type" : "_ZTI13_jobjectArray",
+   "self_type" : "_ZTI13_jobjectArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10894,28 +10607,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "nOptions",
      "field_offset" : 32,
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "options",
      "field_offset" : 64,
-     "referenced_type" : "type-615"
+     "referenced_type" : "_ZTIP12JavaVMOption"
     },
     {
      "field_name" : "ignoreUnrecognized",
      "field_offset" : 96,
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     }
    ],
    "linker_set_key" : "_ZTI14JavaVMInitArgs",
    "name" : "JavaVMInitArgs",
-   "referenced_type" : "type-614",
-   "self_type" : "type-614",
+   "referenced_type" : "_ZTI14JavaVMInitArgs",
+   "self_type" : "_ZTI14JavaVMInitArgs",
    "size" : 16,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10924,14 +10637,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI14_jbooleanArray",
    "name" : "_jbooleanArray",
    "record_kind" : "class",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
+   "referenced_type" : "_ZTI14_jbooleanArray",
+   "self_type" : "_ZTI14_jbooleanArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10941,23 +10654,23 @@
    [
     {
      "field_name" : "name",
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "field_name" : "signature",
      "field_offset" : 32,
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "field_name" : "fnPtr",
      "field_offset" : 64,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
    "linker_set_key" : "_ZTI15JNINativeMethod",
    "name" : "JNINativeMethod",
-   "referenced_type" : "type-514",
-   "self_type" : "type-514",
+   "referenced_type" : "_ZTI15JNINativeMethod",
+   "self_type" : "_ZTI15JNINativeMethod",
    "size" : 12,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10967,23 +10680,23 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "name",
      "field_offset" : 32,
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "field_name" : "group",
      "field_offset" : 64,
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI16JavaVMAttachArgs",
    "name" : "JavaVMAttachArgs",
-   "referenced_type" : "type-612",
-   "self_type" : "type-612",
+   "referenced_type" : "_ZTI16JavaVMAttachArgs",
+   "self_type" : "_ZTI16JavaVMAttachArgs",
    "size" : 12,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10993,48 +10706,48 @@
    [
     {
      "field_name" : "reserved0",
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved1",
      "field_offset" : 32,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved2",
      "field_offset" : 64,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "DestroyJavaVM",
      "field_offset" : 96,
-     "referenced_type" : "type-527"
+     "referenced_type" : "_ZTIPFiP7_JavaVME"
     },
     {
      "field_name" : "AttachCurrentThread",
      "field_offset" : 128,
-     "referenced_type" : "type-529"
+     "referenced_type" : "_ZTIPFiP7_JavaVMPP7_JNIEnvPvE"
     },
     {
      "field_name" : "DetachCurrentThread",
      "field_offset" : 160,
-     "referenced_type" : "type-527"
+     "referenced_type" : "_ZTIPFiP7_JavaVME"
     },
     {
      "field_name" : "GetEnv",
      "field_offset" : 192,
-     "referenced_type" : "type-532"
+     "referenced_type" : "_ZTIPFiP7_JavaVMPPviE"
     },
     {
      "field_name" : "AttachCurrentThreadAsDaemon",
      "field_offset" : 224,
-     "referenced_type" : "type-529"
+     "referenced_type" : "_ZTIPFiP7_JavaVMPP7_JNIEnvPvE"
     }
    ],
    "linker_set_key" : "_ZTI18JNIInvokeInterface",
    "name" : "JNIInvokeInterface",
-   "referenced_type" : "type-526",
-   "self_type" : "type-526",
+   "referenced_type" : "_ZTI18JNIInvokeInterface",
+   "self_type" : "_ZTI18JNIInvokeInterface",
    "size" : 32,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -11044,1173 +10757,1173 @@
    [
     {
      "field_name" : "reserved0",
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved1",
      "field_offset" : 32,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved2",
      "field_offset" : 64,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved3",
      "field_offset" : 96,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "GetVersion",
      "field_offset" : 128,
-     "referenced_type" : "type-14"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvE"
     },
     {
      "field_name" : "DefineClass",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "_ZTIPFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE"
     },
     {
      "field_name" : "FindClass",
      "field_offset" : 192,
-     "referenced_type" : "type-27"
+     "referenced_type" : "_ZTIPFP7_jclassP7_JNIEnvPKcE"
     },
     {
      "field_name" : "FromReflectedMethod",
      "field_offset" : 224,
-     "referenced_type" : "type-29"
+     "referenced_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "FromReflectedField",
      "field_offset" : 256,
-     "referenced_type" : "type-33"
+     "referenced_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "ToReflectedMethod",
      "field_offset" : 288,
-     "referenced_type" : "type-37"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE"
     },
     {
      "field_name" : "GetSuperclass",
      "field_offset" : 320,
-     "referenced_type" : "type-40"
+     "referenced_type" : "_ZTIPFP7_jclassP7_JNIEnvS0_E"
     },
     {
      "field_name" : "IsAssignableFrom",
      "field_offset" : 352,
-     "referenced_type" : "type-42"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassS2_E"
     },
     {
      "field_name" : "ToReflectedField",
      "field_offset" : 384,
-     "referenced_type" : "type-44"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE"
     },
     {
      "field_name" : "Throw",
      "field_offset" : 416,
-     "referenced_type" : "type-46"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP11_jthrowableE"
     },
     {
      "field_name" : "ThrowNew",
      "field_offset" : 448,
-     "referenced_type" : "type-50"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassPKcE"
     },
     {
      "field_name" : "ExceptionOccurred",
      "field_offset" : 480,
-     "referenced_type" : "type-52"
+     "referenced_type" : "_ZTIPFP11_jthrowableP7_JNIEnvE"
     },
     {
      "field_name" : "ExceptionDescribe",
      "field_offset" : 512,
-     "referenced_type" : "type-54"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvE"
     },
     {
      "field_name" : "ExceptionClear",
      "field_offset" : 544,
-     "referenced_type" : "type-54"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvE"
     },
     {
      "field_name" : "FatalError",
      "field_offset" : 576,
-     "referenced_type" : "type-56"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvPKcE"
     },
     {
      "field_name" : "PushLocalFrame",
      "field_offset" : 608,
-     "referenced_type" : "type-58"
+     "referenced_type" : "_ZTIPFiP7_JNIEnviE"
     },
     {
      "field_name" : "PopLocalFrame",
      "field_offset" : 640,
-     "referenced_type" : "type-60"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E"
     },
     {
      "field_name" : "NewGlobalRef",
      "field_offset" : 672,
-     "referenced_type" : "type-60"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E"
     },
     {
      "field_name" : "DeleteGlobalRef",
      "field_offset" : 704,
-     "referenced_type" : "type-62"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "DeleteLocalRef",
      "field_offset" : 736,
-     "referenced_type" : "type-62"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "IsSameObject",
      "field_offset" : 768,
-     "referenced_type" : "type-64"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectS2_E"
     },
     {
      "field_name" : "NewLocalRef",
      "field_offset" : 800,
-     "referenced_type" : "type-60"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E"
     },
     {
      "field_name" : "EnsureLocalCapacity",
      "field_offset" : 832,
-     "referenced_type" : "type-58"
+     "referenced_type" : "_ZTIPFiP7_JNIEnviE"
     },
     {
      "field_name" : "AllocObject",
      "field_offset" : 864,
-     "referenced_type" : "type-3"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassE"
     },
     {
      "field_name" : "NewObject",
      "field_offset" : 896,
-     "referenced_type" : "type-66"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "NewObjectV",
      "field_offset" : 928,
-     "referenced_type" : "type-68"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "NewObjectA",
      "field_offset" : 960,
-     "referenced_type" : "type-71"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "GetObjectClass",
      "field_offset" : 992,
-     "referenced_type" : "type-81"
+     "referenced_type" : "_ZTIPFP7_jclassP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "IsInstanceOf",
      "field_offset" : 1024,
-     "referenced_type" : "type-83"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassE"
     },
     {
      "field_name" : "GetMethodID",
      "field_offset" : 1056,
-     "referenced_type" : "type-85"
+     "referenced_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E"
     },
     {
      "field_name" : "CallObjectMethod",
      "field_offset" : 1088,
-     "referenced_type" : "type-87"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE"
     },
     {
      "field_name" : "CallObjectMethodV",
      "field_offset" : 1120,
-     "referenced_type" : "type-89"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallObjectMethodA",
      "field_offset" : 1152,
-     "referenced_type" : "type-92"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallBooleanMethod",
      "field_offset" : 1184,
-     "referenced_type" : "type-94"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallBooleanMethodV",
      "field_offset" : 1216,
-     "referenced_type" : "type-96"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallBooleanMethodA",
      "field_offset" : 1248,
-     "referenced_type" : "type-99"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallByteMethod",
      "field_offset" : 1280,
-     "referenced_type" : "type-101"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallByteMethodV",
      "field_offset" : 1312,
-     "referenced_type" : "type-103"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallByteMethodA",
      "field_offset" : 1344,
-     "referenced_type" : "type-106"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallCharMethod",
      "field_offset" : 1376,
-     "referenced_type" : "type-108"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallCharMethodV",
      "field_offset" : 1408,
-     "referenced_type" : "type-110"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallCharMethodA",
      "field_offset" : 1440,
-     "referenced_type" : "type-113"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallShortMethod",
      "field_offset" : 1472,
-     "referenced_type" : "type-115"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallShortMethodV",
      "field_offset" : 1504,
-     "referenced_type" : "type-117"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallShortMethodA",
      "field_offset" : 1536,
-     "referenced_type" : "type-120"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallIntMethod",
      "field_offset" : 1568,
-     "referenced_type" : "type-122"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallIntMethodV",
      "field_offset" : 1600,
-     "referenced_type" : "type-124"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallIntMethodA",
      "field_offset" : 1632,
-     "referenced_type" : "type-127"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallLongMethod",
      "field_offset" : 1664,
-     "referenced_type" : "type-129"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallLongMethodV",
      "field_offset" : 1696,
-     "referenced_type" : "type-131"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallLongMethodA",
      "field_offset" : 1728,
-     "referenced_type" : "type-134"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallFloatMethod",
      "field_offset" : 1760,
-     "referenced_type" : "type-136"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallFloatMethodV",
      "field_offset" : 1792,
-     "referenced_type" : "type-138"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallFloatMethodA",
      "field_offset" : 1824,
-     "referenced_type" : "type-141"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallDoubleMethod",
      "field_offset" : 1856,
-     "referenced_type" : "type-143"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallDoubleMethodV",
      "field_offset" : 1888,
-     "referenced_type" : "type-145"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallDoubleMethodA",
      "field_offset" : 1920,
-     "referenced_type" : "type-148"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallVoidMethod",
      "field_offset" : 1952,
-     "referenced_type" : "type-150"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallVoidMethodV",
      "field_offset" : 1984,
-     "referenced_type" : "type-152"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallVoidMethodA",
      "field_offset" : 2016,
-     "referenced_type" : "type-155"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualObjectMethod",
      "field_offset" : 2048,
-     "referenced_type" : "type-157"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualObjectMethodV",
      "field_offset" : 2080,
-     "referenced_type" : "type-159"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualObjectMethodA",
      "field_offset" : 2112,
-     "referenced_type" : "type-162"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualBooleanMethod",
      "field_offset" : 2144,
-     "referenced_type" : "type-164"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualBooleanMethodV",
      "field_offset" : 2176,
-     "referenced_type" : "type-166"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualBooleanMethodA",
      "field_offset" : 2208,
-     "referenced_type" : "type-169"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualByteMethod",
      "field_offset" : 2240,
-     "referenced_type" : "type-171"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualByteMethodV",
      "field_offset" : 2272,
-     "referenced_type" : "type-173"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualByteMethodA",
      "field_offset" : 2304,
-     "referenced_type" : "type-176"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualCharMethod",
      "field_offset" : 2336,
-     "referenced_type" : "type-178"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualCharMethodV",
      "field_offset" : 2368,
-     "referenced_type" : "type-180"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualCharMethodA",
      "field_offset" : 2400,
-     "referenced_type" : "type-183"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualShortMethod",
      "field_offset" : 2432,
-     "referenced_type" : "type-185"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualShortMethodV",
      "field_offset" : 2464,
-     "referenced_type" : "type-187"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualShortMethodA",
      "field_offset" : 2496,
-     "referenced_type" : "type-190"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualIntMethod",
      "field_offset" : 2528,
-     "referenced_type" : "type-192"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualIntMethodV",
      "field_offset" : 2560,
-     "referenced_type" : "type-194"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualIntMethodA",
      "field_offset" : 2592,
-     "referenced_type" : "type-197"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualLongMethod",
      "field_offset" : 2624,
-     "referenced_type" : "type-199"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualLongMethodV",
      "field_offset" : 2656,
-     "referenced_type" : "type-201"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualLongMethodA",
      "field_offset" : 2688,
-     "referenced_type" : "type-204"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualFloatMethod",
      "field_offset" : 2720,
-     "referenced_type" : "type-206"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualFloatMethodV",
      "field_offset" : 2752,
-     "referenced_type" : "type-208"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualFloatMethodA",
      "field_offset" : 2784,
-     "referenced_type" : "type-211"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualDoubleMethod",
      "field_offset" : 2816,
-     "referenced_type" : "type-213"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualDoubleMethodV",
      "field_offset" : 2848,
-     "referenced_type" : "type-215"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualDoubleMethodA",
      "field_offset" : 2880,
-     "referenced_type" : "type-218"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualVoidMethod",
      "field_offset" : 2912,
-     "referenced_type" : "type-220"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualVoidMethodV",
      "field_offset" : 2944,
-     "referenced_type" : "type-222"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallNonvirtualVoidMethodA",
      "field_offset" : 2976,
-     "referenced_type" : "type-225"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "GetFieldID",
      "field_offset" : 3008,
-     "referenced_type" : "type-227"
+     "referenced_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E"
     },
     {
      "field_name" : "GetObjectField",
      "field_offset" : 3040,
-     "referenced_type" : "type-229"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE"
     },
     {
      "field_name" : "GetBooleanField",
      "field_offset" : 3072,
-     "referenced_type" : "type-231"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetByteField",
      "field_offset" : 3104,
-     "referenced_type" : "type-233"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetCharField",
      "field_offset" : 3136,
-     "referenced_type" : "type-235"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetShortField",
      "field_offset" : 3168,
-     "referenced_type" : "type-237"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetIntField",
      "field_offset" : 3200,
-     "referenced_type" : "type-239"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetLongField",
      "field_offset" : 3232,
-     "referenced_type" : "type-241"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetFloatField",
      "field_offset" : 3264,
-     "referenced_type" : "type-243"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetDoubleField",
      "field_offset" : 3296,
-     "referenced_type" : "type-245"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "SetObjectField",
      "field_offset" : 3328,
-     "referenced_type" : "type-247"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E"
     },
     {
      "field_name" : "SetBooleanField",
      "field_offset" : 3360,
-     "referenced_type" : "type-249"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDhE"
     },
     {
      "field_name" : "SetByteField",
      "field_offset" : 3392,
-     "referenced_type" : "type-251"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDaE"
     },
     {
      "field_name" : "SetCharField",
      "field_offset" : 3424,
-     "referenced_type" : "type-253"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDtE"
     },
     {
      "field_name" : "SetShortField",
      "field_offset" : 3456,
-     "referenced_type" : "type-255"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDsE"
     },
     {
      "field_name" : "SetIntField",
      "field_offset" : 3488,
-     "referenced_type" : "type-257"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDiE"
     },
     {
      "field_name" : "SetLongField",
      "field_offset" : 3520,
-     "referenced_type" : "type-259"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDxE"
     },
     {
      "field_name" : "SetFloatField",
      "field_offset" : 3552,
-     "referenced_type" : "type-261"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDfE"
     },
     {
      "field_name" : "SetDoubleField",
      "field_offset" : 3584,
-     "referenced_type" : "type-263"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDdE"
     },
     {
      "field_name" : "GetStaticMethodID",
      "field_offset" : 3616,
-     "referenced_type" : "type-85"
+     "referenced_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E"
     },
     {
      "field_name" : "CallStaticObjectMethod",
      "field_offset" : 3648,
-     "referenced_type" : "type-66"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticObjectMethodV",
      "field_offset" : 3680,
-     "referenced_type" : "type-68"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticObjectMethodA",
      "field_offset" : 3712,
-     "referenced_type" : "type-71"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticBooleanMethod",
      "field_offset" : 3744,
-     "referenced_type" : "type-265"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticBooleanMethodV",
      "field_offset" : 3776,
-     "referenced_type" : "type-267"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticBooleanMethodA",
      "field_offset" : 3808,
-     "referenced_type" : "type-270"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticByteMethod",
      "field_offset" : 3840,
-     "referenced_type" : "type-272"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticByteMethodV",
      "field_offset" : 3872,
-     "referenced_type" : "type-274"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticByteMethodA",
      "field_offset" : 3904,
-     "referenced_type" : "type-277"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticCharMethod",
      "field_offset" : 3936,
-     "referenced_type" : "type-279"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticCharMethodV",
      "field_offset" : 3968,
-     "referenced_type" : "type-281"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticCharMethodA",
      "field_offset" : 4000,
-     "referenced_type" : "type-284"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticShortMethod",
      "field_offset" : 4032,
-     "referenced_type" : "type-286"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticShortMethodV",
      "field_offset" : 4064,
-     "referenced_type" : "type-288"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticShortMethodA",
      "field_offset" : 4096,
-     "referenced_type" : "type-291"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticIntMethod",
      "field_offset" : 4128,
-     "referenced_type" : "type-293"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticIntMethodV",
      "field_offset" : 4160,
-     "referenced_type" : "type-295"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticIntMethodA",
      "field_offset" : 4192,
-     "referenced_type" : "type-298"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticLongMethod",
      "field_offset" : 4224,
-     "referenced_type" : "type-300"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticLongMethodV",
      "field_offset" : 4256,
-     "referenced_type" : "type-302"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticLongMethodA",
      "field_offset" : 4288,
-     "referenced_type" : "type-305"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticFloatMethod",
      "field_offset" : 4320,
-     "referenced_type" : "type-307"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticFloatMethodV",
      "field_offset" : 4352,
-     "referenced_type" : "type-309"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticFloatMethodA",
      "field_offset" : 4384,
-     "referenced_type" : "type-312"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticDoubleMethod",
      "field_offset" : 4416,
-     "referenced_type" : "type-314"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticDoubleMethodV",
      "field_offset" : 4448,
-     "referenced_type" : "type-316"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticDoubleMethodA",
      "field_offset" : 4480,
-     "referenced_type" : "type-319"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticVoidMethod",
      "field_offset" : 4512,
-     "referenced_type" : "type-321"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticVoidMethodV",
      "field_offset" : 4544,
-     "referenced_type" : "type-323"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDSt9__va_listE"
     },
     {
      "field_name" : "CallStaticVoidMethodA",
      "field_offset" : 4576,
-     "referenced_type" : "type-326"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "GetStaticFieldID",
      "field_offset" : 4608,
-     "referenced_type" : "type-227"
+     "referenced_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E"
     },
     {
      "field_name" : "GetStaticObjectField",
      "field_offset" : 4640,
-     "referenced_type" : "type-328"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticBooleanField",
      "field_offset" : 4672,
-     "referenced_type" : "type-330"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticByteField",
      "field_offset" : 4704,
-     "referenced_type" : "type-332"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticCharField",
      "field_offset" : 4736,
-     "referenced_type" : "type-334"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticShortField",
      "field_offset" : 4768,
-     "referenced_type" : "type-336"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticIntField",
      "field_offset" : 4800,
-     "referenced_type" : "type-338"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticLongField",
      "field_offset" : 4832,
-     "referenced_type" : "type-340"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticFloatField",
      "field_offset" : 4864,
-     "referenced_type" : "type-342"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticDoubleField",
      "field_offset" : 4896,
-     "referenced_type" : "type-344"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "SetStaticObjectField",
      "field_offset" : 4928,
-     "referenced_type" : "type-346"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE"
     },
     {
      "field_name" : "SetStaticBooleanField",
      "field_offset" : 4960,
-     "referenced_type" : "type-348"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDhE"
     },
     {
      "field_name" : "SetStaticByteField",
      "field_offset" : 4992,
-     "referenced_type" : "type-350"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDaE"
     },
     {
      "field_name" : "SetStaticCharField",
      "field_offset" : 5024,
-     "referenced_type" : "type-352"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDtE"
     },
     {
      "field_name" : "SetStaticShortField",
      "field_offset" : 5056,
-     "referenced_type" : "type-354"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDsE"
     },
     {
      "field_name" : "SetStaticIntField",
      "field_offset" : 5088,
-     "referenced_type" : "type-356"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDiE"
     },
     {
      "field_name" : "SetStaticLongField",
      "field_offset" : 5120,
-     "referenced_type" : "type-358"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDxE"
     },
     {
      "field_name" : "SetStaticFloatField",
      "field_offset" : 5152,
-     "referenced_type" : "type-360"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDfE"
     },
     {
      "field_name" : "SetStaticDoubleField",
      "field_offset" : 5184,
-     "referenced_type" : "type-362"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDdE"
     },
     {
      "field_name" : "NewString",
      "field_offset" : 5216,
-     "referenced_type" : "type-364"
+     "referenced_type" : "_ZTIPFP8_jstringP7_JNIEnvPKtiE"
     },
     {
      "field_name" : "GetStringLength",
      "field_offset" : 5248,
-     "referenced_type" : "type-370"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jstringE"
     },
     {
      "field_name" : "GetStringChars",
      "field_offset" : 5280,
-     "referenced_type" : "type-372"
+     "referenced_type" : "_ZTIPFPKtP7_JNIEnvP8_jstringPhE"
     },
     {
      "field_name" : "ReleaseStringChars",
      "field_offset" : 5312,
-     "referenced_type" : "type-375"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKtE"
     },
     {
      "field_name" : "NewStringUTF",
      "field_offset" : 5344,
-     "referenced_type" : "type-377"
+     "referenced_type" : "_ZTIPFP8_jstringP7_JNIEnvPKcE"
     },
     {
      "field_name" : "GetStringUTFLength",
      "field_offset" : 5376,
-     "referenced_type" : "type-370"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jstringE"
     },
     {
      "field_name" : "GetStringUTFChars",
      "field_offset" : 5408,
-     "referenced_type" : "type-379"
+     "referenced_type" : "_ZTIPFPKcP7_JNIEnvP8_jstringPhE"
     },
     {
      "field_name" : "ReleaseStringUTFChars",
      "field_offset" : 5440,
-     "referenced_type" : "type-381"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKcE"
     },
     {
      "field_name" : "GetArrayLength",
      "field_offset" : 5472,
-     "referenced_type" : "type-383"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jarrayE"
     },
     {
      "field_name" : "NewObjectArray",
      "field_offset" : 5504,
-     "referenced_type" : "type-387"
+     "referenced_type" : "_ZTIPFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE"
     },
     {
      "field_name" : "GetObjectArrayElement",
      "field_offset" : 5536,
-     "referenced_type" : "type-391"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP13_jobjectArrayiE"
     },
     {
      "field_name" : "SetObjectArrayElement",
      "field_offset" : 5568,
-     "referenced_type" : "type-393"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE"
     },
     {
      "field_name" : "NewBooleanArray",
      "field_offset" : 5600,
-     "referenced_type" : "type-395"
+     "referenced_type" : "_ZTIPFP14_jbooleanArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewByteArray",
      "field_offset" : 5632,
-     "referenced_type" : "type-399"
+     "referenced_type" : "_ZTIPFP11_jbyteArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewCharArray",
      "field_offset" : 5664,
-     "referenced_type" : "type-403"
+     "referenced_type" : "_ZTIPFP11_jcharArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewShortArray",
      "field_offset" : 5696,
-     "referenced_type" : "type-407"
+     "referenced_type" : "_ZTIPFP12_jshortArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewIntArray",
      "field_offset" : 5728,
-     "referenced_type" : "type-411"
+     "referenced_type" : "_ZTIPFP10_jintArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewLongArray",
      "field_offset" : 5760,
-     "referenced_type" : "type-415"
+     "referenced_type" : "_ZTIPFP11_jlongArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewFloatArray",
      "field_offset" : 5792,
-     "referenced_type" : "type-419"
+     "referenced_type" : "_ZTIPFP12_jfloatArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewDoubleArray",
      "field_offset" : 5824,
-     "referenced_type" : "type-423"
+     "referenced_type" : "_ZTIPFP13_jdoubleArrayP7_JNIEnviE"
     },
     {
      "field_name" : "GetBooleanArrayElements",
      "field_offset" : 5856,
-     "referenced_type" : "type-427"
+     "referenced_type" : "_ZTIPFPhP7_JNIEnvP14_jbooleanArrayS_E"
     },
     {
      "field_name" : "GetByteArrayElements",
      "field_offset" : 5888,
-     "referenced_type" : "type-429"
+     "referenced_type" : "_ZTIPFPaP7_JNIEnvP11_jbyteArrayPhE"
     },
     {
      "field_name" : "GetCharArrayElements",
      "field_offset" : 5920,
-     "referenced_type" : "type-432"
+     "referenced_type" : "_ZTIPFPtP7_JNIEnvP11_jcharArrayPhE"
     },
     {
      "field_name" : "GetShortArrayElements",
      "field_offset" : 5952,
-     "referenced_type" : "type-435"
+     "referenced_type" : "_ZTIPFPsP7_JNIEnvP12_jshortArrayPhE"
     },
     {
      "field_name" : "GetIntArrayElements",
      "field_offset" : 5984,
-     "referenced_type" : "type-438"
+     "referenced_type" : "_ZTIPFPiP7_JNIEnvP10_jintArrayPhE"
     },
     {
      "field_name" : "GetLongArrayElements",
      "field_offset" : 6016,
-     "referenced_type" : "type-441"
+     "referenced_type" : "_ZTIPFPxP7_JNIEnvP11_jlongArrayPhE"
     },
     {
      "field_name" : "GetFloatArrayElements",
      "field_offset" : 6048,
-     "referenced_type" : "type-444"
+     "referenced_type" : "_ZTIPFPfP7_JNIEnvP12_jfloatArrayPhE"
     },
     {
      "field_name" : "GetDoubleArrayElements",
      "field_offset" : 6080,
-     "referenced_type" : "type-447"
+     "referenced_type" : "_ZTIPFPdP7_JNIEnvP13_jdoubleArrayPhE"
     },
     {
      "field_name" : "ReleaseBooleanArrayElements",
      "field_offset" : 6112,
-     "referenced_type" : "type-450"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayPhiE"
     },
     {
      "field_name" : "ReleaseByteArrayElements",
      "field_offset" : 6144,
-     "referenced_type" : "type-452"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayPaiE"
     },
     {
      "field_name" : "ReleaseCharArrayElements",
      "field_offset" : 6176,
-     "referenced_type" : "type-454"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayPtiE"
     },
     {
      "field_name" : "ReleaseShortArrayElements",
      "field_offset" : 6208,
-     "referenced_type" : "type-456"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayPsiE"
     },
     {
      "field_name" : "ReleaseIntArrayElements",
      "field_offset" : 6240,
-     "referenced_type" : "type-458"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayPiiE"
     },
     {
      "field_name" : "ReleaseLongArrayElements",
      "field_offset" : 6272,
-     "referenced_type" : "type-460"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayPxiE"
     },
     {
      "field_name" : "ReleaseFloatArrayElements",
      "field_offset" : 6304,
-     "referenced_type" : "type-462"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayPfiE"
     },
     {
      "field_name" : "ReleaseDoubleArrayElements",
      "field_offset" : 6336,
-     "referenced_type" : "type-464"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayPdiE"
     },
     {
      "field_name" : "GetBooleanArrayRegion",
      "field_offset" : 6368,
-     "referenced_type" : "type-466"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPhE"
     },
     {
      "field_name" : "GetByteArrayRegion",
      "field_offset" : 6400,
-     "referenced_type" : "type-468"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPaE"
     },
     {
      "field_name" : "GetCharArrayRegion",
      "field_offset" : 6432,
-     "referenced_type" : "type-470"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPtE"
     },
     {
      "field_name" : "GetShortArrayRegion",
      "field_offset" : 6464,
-     "referenced_type" : "type-472"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPsE"
     },
     {
      "field_name" : "GetIntArrayRegion",
      "field_offset" : 6496,
-     "referenced_type" : "type-474"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPiE"
     },
     {
      "field_name" : "GetLongArrayRegion",
      "field_offset" : 6528,
-     "referenced_type" : "type-476"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPxE"
     },
     {
      "field_name" : "GetFloatArrayRegion",
      "field_offset" : 6560,
-     "referenced_type" : "type-478"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPfE"
     },
     {
      "field_name" : "GetDoubleArrayRegion",
      "field_offset" : 6592,
-     "referenced_type" : "type-480"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPdE"
     },
     {
      "field_name" : "SetBooleanArrayRegion",
      "field_offset" : 6624,
-     "referenced_type" : "type-482"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPKhE"
     },
     {
      "field_name" : "SetByteArrayRegion",
      "field_offset" : 6656,
-     "referenced_type" : "type-486"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPKaE"
     },
     {
      "field_name" : "SetCharArrayRegion",
      "field_offset" : 6688,
-     "referenced_type" : "type-488"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPKtE"
     },
     {
      "field_name" : "SetShortArrayRegion",
      "field_offset" : 6720,
-     "referenced_type" : "type-490"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPKsE"
     },
     {
      "field_name" : "SetIntArrayRegion",
      "field_offset" : 6752,
-     "referenced_type" : "type-494"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPKiE"
     },
     {
      "field_name" : "SetLongArrayRegion",
      "field_offset" : 6784,
-     "referenced_type" : "type-498"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPKxE"
     },
     {
      "field_name" : "SetFloatArrayRegion",
      "field_offset" : 6816,
-     "referenced_type" : "type-502"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPKfE"
     },
     {
      "field_name" : "SetDoubleArrayRegion",
      "field_offset" : 6848,
-     "referenced_type" : "type-506"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPKdE"
     },
     {
      "field_name" : "RegisterNatives",
      "field_offset" : 6880,
-     "referenced_type" : "type-510"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE"
     },
     {
      "field_name" : "UnregisterNatives",
      "field_offset" : 6912,
-     "referenced_type" : "type-515"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassE"
     },
     {
      "field_name" : "MonitorEnter",
      "field_offset" : 6944,
-     "referenced_type" : "type-517"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "MonitorExit",
      "field_offset" : 6976,
-     "referenced_type" : "type-517"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "GetJavaVM",
      "field_offset" : 7008,
-     "referenced_type" : "type-519"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvPP7_JavaVME"
     },
     {
      "field_name" : "GetStringRegion",
      "field_offset" : 7040,
-     "referenced_type" : "type-535"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringiiPtE"
     },
     {
      "field_name" : "GetStringUTFRegion",
      "field_offset" : 7072,
-     "referenced_type" : "type-537"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringiiPcE"
     },
     {
      "field_name" : "GetPrimitiveArrayCritical",
      "field_offset" : 7104,
-     "referenced_type" : "type-540"
+     "referenced_type" : "_ZTIPFPvP7_JNIEnvP7_jarrayPhE"
     },
     {
      "field_name" : "ReleasePrimitiveArrayCritical",
      "field_offset" : 7136,
-     "referenced_type" : "type-542"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jarrayPviE"
     },
     {
      "field_name" : "GetStringCritical",
      "field_offset" : 7168,
-     "referenced_type" : "type-372"
+     "referenced_type" : "_ZTIPFPKtP7_JNIEnvP8_jstringPhE"
     },
     {
      "field_name" : "ReleaseStringCritical",
      "field_offset" : 7200,
-     "referenced_type" : "type-375"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKtE"
     },
     {
      "field_name" : "NewWeakGlobalRef",
      "field_offset" : 7232,
-     "referenced_type" : "type-60"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E"
     },
     {
      "field_name" : "DeleteWeakGlobalRef",
      "field_offset" : 7264,
-     "referenced_type" : "type-62"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "ExceptionCheck",
      "field_offset" : 7296,
-     "referenced_type" : "type-544"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvE"
     },
     {
      "field_name" : "NewDirectByteBuffer",
      "field_offset" : 7328,
-     "referenced_type" : "type-546"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvPvxE"
     },
     {
      "field_name" : "GetDirectBufferAddress",
      "field_offset" : 7360,
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIPFPvP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "GetDirectBufferCapacity",
      "field_offset" : 7392,
-     "referenced_type" : "type-550"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "GetObjectRefType",
      "field_offset" : 7424,
-     "referenced_type" : "type-552"
+     "referenced_type" : "_ZTIPF14jobjectRefTypeP7_JNIEnvP8_jobjectE"
     }
    ],
    "linker_set_key" : "_ZTI18JNINativeInterface",
    "name" : "JNINativeInterface",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "_ZTI18JNINativeInterface",
+   "self_type" : "_ZTI18JNINativeInterface",
    "size" : 932,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12220,46 +11933,46 @@
    [
     {
      "field_name" : "z",
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     },
     {
      "field_name" : "b",
-     "referenced_type" : "type-26"
+     "referenced_type" : "_ZTIa"
     },
     {
      "field_name" : "c",
-     "referenced_type" : "type-76"
+     "referenced_type" : "_ZTIt"
     },
     {
      "field_name" : "s",
-     "referenced_type" : "type-77"
+     "referenced_type" : "_ZTIs"
     },
     {
      "field_name" : "i",
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "j",
-     "referenced_type" : "type-78"
+     "referenced_type" : "_ZTIx"
     },
     {
      "field_name" : "f",
-     "referenced_type" : "type-79"
+     "referenced_type" : "_ZTIf"
     },
     {
      "field_name" : "d",
-     "referenced_type" : "type-80"
+     "referenced_type" : "_ZTId"
     },
     {
      "field_name" : "l",
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI6jvalue",
    "name" : "jvalue",
    "record_kind" : "union",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "_ZTI6jvalue",
+   "self_type" : "_ZTI6jvalue",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12269,13 +11982,13 @@
    [
     {
      "field_name" : "functions",
-     "referenced_type" : "type-9"
+     "referenced_type" : "_ZTIPK18JNINativeInterface"
     }
    ],
    "linker_set_key" : "_ZTI7_JNIEnv",
    "name" : "_JNIEnv",
-   "referenced_type" : "type-8",
-   "self_type" : "type-8",
+   "referenced_type" : "_ZTI7_JNIEnv",
+   "self_type" : "_ZTI7_JNIEnv",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12285,13 +11998,13 @@
    [
     {
      "field_name" : "functions",
-     "referenced_type" : "type-524"
+     "referenced_type" : "_ZTIPK18JNIInvokeInterface"
     }
    ],
    "linker_set_key" : "_ZTI7_JavaVM",
    "name" : "_JavaVM",
-   "referenced_type" : "type-523",
-   "self_type" : "type-523",
+   "referenced_type" : "_ZTI7_JavaVM",
+   "self_type" : "_ZTI7_JavaVM",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12300,14 +12013,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTI8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI7_jarray",
    "name" : "_jarray",
    "record_kind" : "class",
-   "referenced_type" : "type-386",
-   "self_type" : "type-386",
+   "referenced_type" : "_ZTI7_jarray",
+   "self_type" : "_ZTI7_jarray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12316,14 +12029,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTI8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI7_jclass",
    "name" : "_jclass",
    "record_kind" : "class",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "_ZTI7_jclass",
+   "self_type" : "_ZTI7_jclass",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12332,8 +12045,8 @@
    "linker_set_key" : "_ZTI8_jobject",
    "name" : "_jobject",
    "record_kind" : "class",
-   "referenced_type" : "type-6",
-   "self_type" : "type-6",
+   "referenced_type" : "_ZTI8_jobject",
+   "self_type" : "_ZTI8_jobject",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12342,14 +12055,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTI8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI8_jstring",
    "name" : "_jstring",
    "record_kind" : "class",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
+   "referenced_type" : "_ZTI8_jstring",
+   "self_type" : "_ZTI8_jstring",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   }
diff --git a/R/64/x86/source-based/libbinder_ndk.so.lsdump b/R/64/x86/source-based/libbinder_ndk.so.lsdump
index 2937bb9..dcfa9f2 100644
--- a/R/64/x86/source-based/libbinder_ndk.so.lsdump
+++ b/R/64/x86/source-based/libbinder_ndk.so.lsdump
@@ -8,8 +8,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIDs",
    "name" : "char16_t",
-   "referenced_type" : "type-602",
-   "self_type" : "type-602",
+   "referenced_type" : "_ZTIDs",
+   "self_type" : "_ZTIDs",
    "size" : 2
   },
   {
@@ -17,8 +17,8 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIa",
    "name" : "signed char",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
+   "referenced_type" : "_ZTIa",
+   "self_type" : "_ZTIa",
    "size" : 1
   },
   {
@@ -27,8 +27,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIb",
    "name" : "bool",
-   "referenced_type" : "type-556",
-   "self_type" : "type-556",
+   "referenced_type" : "_ZTIb",
+   "self_type" : "_ZTIb",
    "size" : 1
   },
   {
@@ -36,24 +36,24 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIc",
    "name" : "char",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIc",
    "size" : 1
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTId",
    "name" : "double",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
+   "referenced_type" : "_ZTId",
+   "self_type" : "_ZTId",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIf",
    "name" : "float",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
+   "referenced_type" : "_ZTIf",
+   "self_type" : "_ZTIf",
    "size" : 4
   },
   {
@@ -62,8 +62,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIh",
    "name" : "unsigned char",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIh",
    "size" : 1
   },
   {
@@ -71,8 +71,8 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIi",
    "name" : "int",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
+   "referenced_type" : "_ZTIi",
+   "self_type" : "_ZTIi",
    "size" : 4
   },
   {
@@ -81,8 +81,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIj",
    "name" : "unsigned int",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
+   "referenced_type" : "_ZTIj",
+   "self_type" : "_ZTIj",
    "size" : 4
   },
   {
@@ -90,8 +90,8 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIs",
    "name" : "short",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "_ZTIs",
+   "self_type" : "_ZTIs",
    "size" : 2
   },
   {
@@ -100,23 +100,23 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIt",
    "name" : "unsigned short",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "_ZTIt",
+   "self_type" : "_ZTIt",
    "size" : 2
   },
   {
    "linker_set_key" : "_ZTIv",
    "name" : "void",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13"
+   "referenced_type" : "_ZTIv",
+   "self_type" : "_ZTIv"
   },
   {
    "alignment" : 4,
    "is_integral" : true,
    "linker_set_key" : "_ZTIx",
    "name" : "long long",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
+   "referenced_type" : "_ZTIx",
+   "self_type" : "_ZTIx",
    "size" : 8
   },
   {
@@ -125,8 +125,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIy",
    "name" : "unsigned long long",
-   "referenced_type" : "type-601",
-   "self_type" : "type-601",
+   "referenced_type" : "_ZTIy",
+   "self_type" : "_ZTIy",
    "size" : 8
   }
  ],
@@ -466,11 +466,11 @@
    ],
    "linker_set_key" : "_ZTI14jobjectRefType",
    "name" : "jobjectRefType",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
+   "referenced_type" : "_ZTI14jobjectRefType",
+   "self_type" : "_ZTI14jobjectRefType",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h",
-   "underlying_type" : "type-525"
+   "underlying_type" : "_ZTIj"
   }
  ],
  "function_types" :
@@ -482,15 +482,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-523",
-   "return_type" : "type-524",
-   "self_type" : "type-523",
+   "referenced_type" : "_ZTIF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTI14jobjectRefType",
+   "self_type" : "_ZTIF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -500,15 +500,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-383",
-   "return_type" : "type-384",
-   "self_type" : "type-383",
+   "referenced_type" : "_ZTIFP10_jintArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP10_jintArray",
+   "self_type" : "_ZTIFP10_jintArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -518,21 +518,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-86",
-   "return_type" : "type-31",
-   "self_type" : "type-86",
+   "referenced_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
+   "return_type" : "_ZTIP10_jmethodID",
+   "self_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -542,15 +542,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-30",
-   "return_type" : "type-31",
-   "self_type" : "type-30",
+   "referenced_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIP10_jmethodID",
+   "self_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -560,15 +560,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-371",
-   "return_type" : "type-372",
-   "self_type" : "type-371",
+   "referenced_type" : "_ZTIFP11_jbyteArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP11_jbyteArray",
+   "self_type" : "_ZTIFP11_jbyteArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -578,15 +578,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-375",
-   "return_type" : "type-376",
-   "self_type" : "type-375",
+   "referenced_type" : "_ZTIFP11_jcharArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP11_jcharArray",
+   "self_type" : "_ZTIFP11_jcharArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -596,15 +596,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-387",
-   "return_type" : "type-388",
-   "self_type" : "type-387",
+   "referenced_type" : "_ZTIFP11_jlongArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP11_jlongArray",
+   "self_type" : "_ZTIFP11_jlongArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -614,12 +614,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     }
    ],
-   "referenced_type" : "type-53",
-   "return_type" : "type-48",
-   "self_type" : "type-53",
+   "referenced_type" : "_ZTIFP11_jthrowableP7_JNIEnvE",
+   "return_type" : "_ZTIP11_jthrowable",
+   "self_type" : "_ZTIFP11_jthrowableP7_JNIEnvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -629,15 +629,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-391",
-   "return_type" : "type-392",
-   "self_type" : "type-391",
+   "referenced_type" : "_ZTIFP12_jfloatArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP12_jfloatArray",
+   "self_type" : "_ZTIFP12_jfloatArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -647,15 +647,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-379",
-   "return_type" : "type-380",
-   "self_type" : "type-379",
+   "referenced_type" : "_ZTIFP12_jshortArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP12_jshortArray",
+   "self_type" : "_ZTIFP12_jshortArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -665,15 +665,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-395",
-   "return_type" : "type-396",
-   "self_type" : "type-395",
+   "referenced_type" : "_ZTIFP13_jdoubleArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP13_jdoubleArray",
+   "self_type" : "_ZTIFP13_jdoubleArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -683,21 +683,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-359",
-   "return_type" : "type-360",
-   "self_type" : "type-359",
+   "referenced_type" : "_ZTIFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
+   "return_type" : "_ZTIP13_jobjectArray",
+   "self_type" : "_ZTIFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -707,15 +707,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-367",
-   "return_type" : "type-368",
-   "self_type" : "type-367",
+   "referenced_type" : "_ZTIFP14_jbooleanArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP14_jbooleanArray",
+   "self_type" : "_ZTIFP14_jbooleanArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -725,15 +725,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-82",
-   "return_type" : "type-19",
-   "self_type" : "type-82",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIP7_jclass",
+   "self_type" : "_ZTIFP7_jclassP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -743,15 +743,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-28",
-   "return_type" : "type-19",
-   "self_type" : "type-28",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvPKcE",
+   "return_type" : "_ZTIP7_jclass",
+   "self_type" : "_ZTIFP7_jclassP7_JNIEnvPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -761,24 +761,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "_ZTIPKa"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-18",
-   "return_type" : "type-19",
-   "self_type" : "type-18",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
+   "return_type" : "_ZTIP7_jclass",
+   "self_type" : "_ZTIFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -788,15 +788,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-41",
-   "return_type" : "type-19",
-   "self_type" : "type-41",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvS0_E",
+   "return_type" : "_ZTIP7_jclass",
+   "self_type" : "_ZTIFP7_jclassP7_JNIEnvS0_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -806,18 +806,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-360"
+     "referenced_type" : "_ZTIP13_jobjectArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-363",
-   "return_type" : "type-5",
-   "self_type" : "type-363",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -827,15 +827,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-4",
-   "return_type" : "type-5",
-   "self_type" : "type-4",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -845,21 +845,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-72",
-   "return_type" : "type-5",
-   "self_type" : "type-72",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -869,21 +869,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-69",
-   "return_type" : "type-5",
-   "self_type" : "type-69",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -893,21 +893,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     }
    ],
-   "referenced_type" : "type-38",
-   "return_type" : "type-5",
-   "self_type" : "type-38",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -917,18 +917,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-67",
-   "return_type" : "type-5",
-   "self_type" : "type-67",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -938,18 +938,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-300",
-   "return_type" : "type-5",
-   "self_type" : "type-300",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -959,21 +959,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     }
    ],
-   "referenced_type" : "type-45",
-   "return_type" : "type-5",
-   "self_type" : "type-45",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -983,18 +983,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "_ZTIx"
     }
    ],
-   "referenced_type" : "type-517",
-   "return_type" : "type-5",
-   "self_type" : "type-517",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvPvxE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvPvxE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1004,15 +1004,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-61",
-   "return_type" : "type-5",
-   "self_type" : "type-61",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_E",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1022,21 +1022,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-92",
-   "return_type" : "type-5",
-   "self_type" : "type-92",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1046,21 +1046,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-90",
-   "return_type" : "type-5",
-   "self_type" : "type-90",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPcE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1070,18 +1070,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-88",
-   "return_type" : "type-5",
-   "self_type" : "type-88",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1091,24 +1091,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-152",
-   "return_type" : "type-5",
-   "self_type" : "type-152",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1118,24 +1118,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-150",
-   "return_type" : "type-5",
-   "self_type" : "type-150",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1145,21 +1145,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-148",
-   "return_type" : "type-5",
-   "self_type" : "type-148",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1169,18 +1169,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-210",
-   "return_type" : "type-5",
-   "self_type" : "type-210",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1190,15 +1190,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-349",
-   "return_type" : "type-337",
-   "self_type" : "type-349",
+   "referenced_type" : "_ZTIFP8_jstringP7_JNIEnvPKcE",
+   "return_type" : "_ZTIP8_jstring",
+   "self_type" : "_ZTIFP8_jstringP7_JNIEnvPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1208,18 +1208,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-339"
+     "referenced_type" : "_ZTIPKt"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-336",
-   "return_type" : "type-337",
-   "self_type" : "type-336",
+   "referenced_type" : "_ZTIFP8_jstringP7_JNIEnvPKtiE",
+   "return_type" : "_ZTIP8_jstring",
+   "self_type" : "_ZTIFP8_jstringP7_JNIEnvPKtiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1229,21 +1229,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-208",
-   "return_type" : "type-35",
-   "self_type" : "type-208",
+   "referenced_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
+   "return_type" : "_ZTIP9_jfieldID",
+   "self_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1253,15 +1253,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-34",
-   "return_type" : "type-35",
-   "self_type" : "type-34",
+   "referenced_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIP9_jfieldID",
+   "self_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1271,18 +1271,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-337"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-351",
-   "return_type" : "type-21",
-   "self_type" : "type-351",
+   "referenced_type" : "_ZTIFPKcP7_JNIEnvP8_jstringPhE",
+   "return_type" : "_ZTIPKc",
+   "self_type" : "_ZTIFPKcP7_JNIEnvP8_jstringPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1292,18 +1292,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-585"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-525"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "_ZTIPi"
     }
    ],
-   "referenced_type" : "type-586",
-   "return_type" : "type-21",
-   "self_type" : "type-586",
+   "referenced_type" : "_ZTIFPKcPKvjPiE",
+   "return_type" : "_ZTIPKc",
+   "self_type" : "_ZTIFPKcPKvjPiE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1313,18 +1313,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-337"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-344",
-   "return_type" : "type-339",
-   "self_type" : "type-344",
+   "referenced_type" : "_ZTIFPKtP7_JNIEnvP8_jstringPhE",
+   "return_type" : "_ZTIPKt",
+   "self_type" : "_ZTIFPKtP7_JNIEnvP8_jstringPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1334,18 +1334,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-372"
+     "referenced_type" : "_ZTIP11_jbyteArray"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-401",
-   "return_type" : "type-402",
-   "self_type" : "type-401",
+   "referenced_type" : "_ZTIFPaP7_JNIEnvP11_jbyteArrayPhE",
+   "return_type" : "_ZTIPa",
+   "self_type" : "_ZTIFPaP7_JNIEnvP11_jbyteArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1355,18 +1355,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-396"
+     "referenced_type" : "_ZTIP13_jdoubleArray"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-419",
-   "return_type" : "type-420",
-   "self_type" : "type-419",
+   "referenced_type" : "_ZTIFPdP7_JNIEnvP13_jdoubleArrayPhE",
+   "return_type" : "_ZTIPd",
+   "self_type" : "_ZTIFPdP7_JNIEnvP13_jdoubleArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1376,18 +1376,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-392"
+     "referenced_type" : "_ZTIP12_jfloatArray"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-416",
-   "return_type" : "type-417",
-   "self_type" : "type-416",
+   "referenced_type" : "_ZTIFPfP7_JNIEnvP12_jfloatArrayPhE",
+   "return_type" : "_ZTIPf",
+   "self_type" : "_ZTIFPfP7_JNIEnvP12_jfloatArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1397,18 +1397,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "_ZTIP14_jbooleanArray"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-399",
-   "return_type" : "type-345",
-   "self_type" : "type-399",
+   "referenced_type" : "_ZTIFPhP7_JNIEnvP14_jbooleanArrayS_E",
+   "return_type" : "_ZTIPh",
+   "self_type" : "_ZTIFPhP7_JNIEnvP14_jbooleanArrayS_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1418,18 +1418,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-384"
+     "referenced_type" : "_ZTIP10_jintArray"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-410",
-   "return_type" : "type-411",
-   "self_type" : "type-410",
+   "referenced_type" : "_ZTIFPiP7_JNIEnvP10_jintArrayPhE",
+   "return_type" : "_ZTIPi",
+   "self_type" : "_ZTIFPiP7_JNIEnvP10_jintArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1439,18 +1439,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-380"
+     "referenced_type" : "_ZTIP12_jshortArray"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-407",
-   "return_type" : "type-408",
-   "self_type" : "type-407",
+   "referenced_type" : "_ZTIFPsP7_JNIEnvP12_jshortArrayPhE",
+   "return_type" : "_ZTIPs",
+   "self_type" : "_ZTIFPsP7_JNIEnvP12_jshortArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1460,18 +1460,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-376"
+     "referenced_type" : "_ZTIP11_jcharArray"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-404",
-   "return_type" : "type-405",
-   "self_type" : "type-404",
+   "referenced_type" : "_ZTIFPtP7_JNIEnvP11_jcharArrayPhE",
+   "return_type" : "_ZTIPt",
+   "self_type" : "_ZTIFPtP7_JNIEnvP11_jcharArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1481,18 +1481,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-356"
+     "referenced_type" : "_ZTIP7_jarray"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-511",
-   "return_type" : "type-12",
-   "self_type" : "type-511",
+   "referenced_type" : "_ZTIFPvP7_JNIEnvP7_jarrayPhE",
+   "return_type" : "_ZTIPv",
+   "self_type" : "_ZTIFPvP7_JNIEnvP7_jarrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1502,15 +1502,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-519",
-   "return_type" : "type-12",
-   "self_type" : "type-519",
+   "referenced_type" : "_ZTIFPvP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIPv",
+   "self_type" : "_ZTIFPvP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1520,12 +1520,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "referenced_type" : "type-567",
-   "return_type" : "type-12",
-   "self_type" : "type-567",
+   "referenced_type" : "_ZTIFPvS_E",
+   "return_type" : "_ZTIPv",
+   "self_type" : "_ZTIFPvS_E",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -1535,18 +1535,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-388"
+     "referenced_type" : "_ZTIP11_jlongArray"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-413",
-   "return_type" : "type-414",
-   "self_type" : "type-413",
+   "referenced_type" : "_ZTIFPxP7_JNIEnvP11_jlongArrayPhE",
+   "return_type" : "_ZTIPx",
+   "self_type" : "_ZTIFPxP7_JNIEnvP11_jlongArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1556,21 +1556,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-256",
-   "return_type" : "type-26",
-   "self_type" : "type-256",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1580,21 +1580,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-254",
-   "return_type" : "type-26",
-   "self_type" : "type-254",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1604,18 +1604,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-252",
-   "return_type" : "type-26",
-   "self_type" : "type-252",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1625,18 +1625,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-304",
-   "return_type" : "type-26",
-   "self_type" : "type-304",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1646,21 +1646,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-104",
-   "return_type" : "type-26",
-   "self_type" : "type-104",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1670,21 +1670,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-102",
-   "return_type" : "type-26",
-   "self_type" : "type-102",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1694,18 +1694,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-100",
-   "return_type" : "type-26",
-   "self_type" : "type-100",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1715,24 +1715,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-164",
-   "return_type" : "type-26",
-   "self_type" : "type-164",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1742,24 +1742,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-162",
-   "return_type" : "type-26",
-   "self_type" : "type-162",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1769,21 +1769,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-160",
-   "return_type" : "type-26",
-   "self_type" : "type-160",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1793,18 +1793,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-214",
-   "return_type" : "type-26",
-   "self_type" : "type-214",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1814,15 +1814,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-585"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-525"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "referenced_type" : "type-612",
-   "return_type" : "type-556",
-   "self_type" : "type-612",
+   "referenced_type" : "_ZTIFbPKvjE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPKvjE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1832,15 +1832,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-590",
-   "return_type" : "type-556",
-   "self_type" : "type-590",
+   "referenced_type" : "_ZTIFbPviE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1850,18 +1850,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-640"
+     "referenced_type" : "_ZTIPPDs"
     }
    ],
-   "referenced_type" : "type-639",
-   "return_type" : "type-556",
-   "self_type" : "type-639",
+   "referenced_type" : "_ZTIFbPviPPDsE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPDsE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1871,18 +1871,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-643"
+     "referenced_type" : "_ZTIPPa"
     }
    ],
-   "referenced_type" : "type-642",
-   "return_type" : "type-556",
-   "self_type" : "type-642",
+   "referenced_type" : "_ZTIFbPviPPaE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPaE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1892,18 +1892,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-582"
+     "referenced_type" : "_ZTIPPc"
     }
    ],
-   "referenced_type" : "type-581",
-   "return_type" : "type-556",
-   "self_type" : "type-581",
+   "referenced_type" : "_ZTIFbPviPPcE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPcE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1913,18 +1913,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-634"
+     "referenced_type" : "_ZTIPPd"
     }
    ],
-   "referenced_type" : "type-633",
-   "return_type" : "type-556",
-   "self_type" : "type-633",
+   "referenced_type" : "_ZTIFbPviPPdE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPdE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1934,18 +1934,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-631"
+     "referenced_type" : "_ZTIPPf"
     }
    ],
-   "referenced_type" : "type-630",
-   "return_type" : "type-556",
-   "self_type" : "type-630",
+   "referenced_type" : "_ZTIFbPviPPfE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPfE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1955,18 +1955,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-617"
+     "referenced_type" : "_ZTIPPi"
     }
    ],
-   "referenced_type" : "type-616",
-   "return_type" : "type-556",
-   "self_type" : "type-616",
+   "referenced_type" : "_ZTIFbPviPPiE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPiE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1976,18 +1976,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-620"
+     "referenced_type" : "_ZTIPPj"
     }
    ],
-   "referenced_type" : "type-619",
-   "return_type" : "type-556",
-   "self_type" : "type-619",
+   "referenced_type" : "_ZTIFbPviPPjE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPjE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1997,18 +1997,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-623"
+     "referenced_type" : "_ZTIPPx"
     }
    ],
-   "referenced_type" : "type-622",
-   "return_type" : "type-556",
-   "self_type" : "type-622",
+   "referenced_type" : "_ZTIFbPviPPxE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPxE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -2018,18 +2018,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-626"
+     "referenced_type" : "_ZTIPPy"
     }
    ],
-   "referenced_type" : "type-625",
-   "return_type" : "type-556",
-   "self_type" : "type-625",
+   "referenced_type" : "_ZTIFbPviPPyE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPyE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -2039,21 +2039,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-525"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-582"
+     "referenced_type" : "_ZTIPPc"
     }
    ],
-   "referenced_type" : "type-592",
-   "return_type" : "type-556",
-   "self_type" : "type-592",
+   "referenced_type" : "_ZTIFbPvjiPPcE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPvjiPPcE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -2063,21 +2063,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-292",
-   "return_type" : "type-80",
-   "self_type" : "type-292",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2087,21 +2087,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-290",
-   "return_type" : "type-80",
-   "self_type" : "type-290",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2111,18 +2111,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-288",
-   "return_type" : "type-80",
-   "self_type" : "type-288",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2132,18 +2132,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-316",
-   "return_type" : "type-80",
-   "self_type" : "type-316",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2153,21 +2153,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-140",
-   "return_type" : "type-80",
-   "self_type" : "type-140",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2177,21 +2177,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-138",
-   "return_type" : "type-80",
-   "self_type" : "type-138",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2201,18 +2201,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-136",
-   "return_type" : "type-80",
-   "self_type" : "type-136",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2222,24 +2222,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-200",
-   "return_type" : "type-80",
-   "self_type" : "type-200",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2249,24 +2249,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-198",
-   "return_type" : "type-80",
-   "self_type" : "type-198",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2276,21 +2276,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-196",
-   "return_type" : "type-80",
-   "self_type" : "type-196",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2300,18 +2300,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-226",
-   "return_type" : "type-80",
-   "self_type" : "type-226",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2321,21 +2321,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-286",
-   "return_type" : "type-79",
-   "self_type" : "type-286",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2345,21 +2345,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-284",
-   "return_type" : "type-79",
-   "self_type" : "type-284",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2369,18 +2369,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-282",
-   "return_type" : "type-79",
-   "self_type" : "type-282",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2390,18 +2390,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-314",
-   "return_type" : "type-79",
-   "self_type" : "type-314",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2411,21 +2411,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-134",
-   "return_type" : "type-79",
-   "self_type" : "type-134",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2435,21 +2435,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-132",
-   "return_type" : "type-79",
-   "self_type" : "type-132",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2459,18 +2459,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-130",
-   "return_type" : "type-79",
-   "self_type" : "type-130",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2480,24 +2480,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-194",
-   "return_type" : "type-79",
-   "self_type" : "type-194",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2507,24 +2507,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-192",
-   "return_type" : "type-79",
-   "self_type" : "type-192",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2534,21 +2534,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-190",
-   "return_type" : "type-79",
-   "self_type" : "type-190",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2558,18 +2558,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-224",
-   "return_type" : "type-79",
-   "self_type" : "type-224",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2579,12 +2579,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     }
    ],
-   "referenced_type" : "type-515",
-   "return_type" : "type-39",
-   "self_type" : "type-515",
+   "referenced_type" : "_ZTIFhP7_JNIEnvE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2594,21 +2594,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-250",
-   "return_type" : "type-39",
-   "self_type" : "type-250",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2618,21 +2618,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-248",
-   "return_type" : "type-39",
-   "self_type" : "type-248",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2642,18 +2642,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-246",
-   "return_type" : "type-39",
-   "self_type" : "type-246",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2663,18 +2663,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-302",
-   "return_type" : "type-39",
-   "self_type" : "type-302",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2684,18 +2684,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-43",
-   "return_type" : "type-39",
-   "self_type" : "type-43",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassS2_E",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassS2_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2705,21 +2705,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-98",
-   "return_type" : "type-39",
-   "self_type" : "type-98",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2729,21 +2729,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-96",
-   "return_type" : "type-39",
-   "self_type" : "type-96",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2753,18 +2753,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-94",
-   "return_type" : "type-39",
-   "self_type" : "type-94",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2774,18 +2774,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-84",
-   "return_type" : "type-39",
-   "self_type" : "type-84",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2795,24 +2795,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-158",
-   "return_type" : "type-39",
-   "self_type" : "type-158",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2822,24 +2822,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-156",
-   "return_type" : "type-39",
-   "self_type" : "type-156",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2849,21 +2849,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-154",
-   "return_type" : "type-39",
-   "self_type" : "type-154",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2873,18 +2873,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-212",
-   "return_type" : "type-39",
-   "self_type" : "type-212",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2894,18 +2894,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-65",
-   "return_type" : "type-39",
-   "self_type" : "type-65",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectS2_E",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectS2_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2915,18 +2915,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-585"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-525"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "referenced_type" : "type-594",
-   "return_type" : "type-16",
-   "self_type" : "type-594",
+   "referenced_type" : "_ZTIFiP7AParcelPKvjE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7AParcelPKvjE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -2936,12 +2936,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     }
    ],
-   "referenced_type" : "type-15",
-   "return_type" : "type-16",
-   "self_type" : "type-15",
+   "referenced_type" : "_ZTIFiP7_JNIEnvE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2951,15 +2951,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "_ZTIP11_jthrowable"
     }
    ],
-   "referenced_type" : "type-47",
-   "return_type" : "type-16",
-   "self_type" : "type-47",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP11_jthrowableE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP11_jthrowableE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2969,15 +2969,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-356"
+     "referenced_type" : "_ZTIP7_jarray"
     }
    ],
-   "referenced_type" : "type-355",
-   "return_type" : "type-16",
-   "self_type" : "type-355",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jarrayE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jarrayE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2987,15 +2987,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-487",
-   "return_type" : "type-16",
-   "self_type" : "type-487",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3005,21 +3005,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-274",
-   "return_type" : "type-16",
-   "self_type" : "type-274",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3029,21 +3029,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-272",
-   "return_type" : "type-16",
-   "self_type" : "type-272",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3053,18 +3053,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-270",
-   "return_type" : "type-16",
-   "self_type" : "type-270",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3074,18 +3074,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-310",
-   "return_type" : "type-16",
-   "self_type" : "type-310",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3095,21 +3095,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-483"
+     "referenced_type" : "_ZTIPK15JNINativeMethod"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-482",
-   "return_type" : "type-16",
-   "self_type" : "type-482",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3119,18 +3119,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-51",
-   "return_type" : "type-16",
-   "self_type" : "type-51",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassPKcE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3140,15 +3140,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-489",
-   "return_type" : "type-16",
-   "self_type" : "type-489",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3158,21 +3158,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-122",
-   "return_type" : "type-16",
-   "self_type" : "type-122",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3182,21 +3182,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-120",
-   "return_type" : "type-16",
-   "self_type" : "type-120",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3206,18 +3206,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-118",
-   "return_type" : "type-16",
-   "self_type" : "type-118",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3227,24 +3227,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-182",
-   "return_type" : "type-16",
-   "self_type" : "type-182",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3254,24 +3254,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-180",
-   "return_type" : "type-16",
-   "self_type" : "type-180",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3281,21 +3281,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-178",
-   "return_type" : "type-16",
-   "self_type" : "type-178",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3305,18 +3305,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-220",
-   "return_type" : "type-16",
-   "self_type" : "type-220",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3326,15 +3326,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-337"
+     "referenced_type" : "_ZTIP8_jstring"
     }
    ],
-   "referenced_type" : "type-342",
-   "return_type" : "type-16",
-   "self_type" : "type-342",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jstringE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jstringE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3344,15 +3344,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-492"
+     "referenced_type" : "_ZTIPP7_JavaVM"
     }
    ],
-   "referenced_type" : "type-491",
-   "return_type" : "type-16",
-   "self_type" : "type-491",
+   "referenced_type" : "_ZTIFiP7_JNIEnvPP7_JavaVME",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvPP7_JavaVME",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3362,15 +3362,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-59",
-   "return_type" : "type-16",
-   "self_type" : "type-59",
+   "referenced_type" : "_ZTIFiP7_JNIEnviE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3380,12 +3380,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-493"
+     "referenced_type" : "_ZTIP7_JavaVM"
     }
    ],
-   "referenced_type" : "type-499",
-   "return_type" : "type-16",
-   "self_type" : "type-499",
+   "referenced_type" : "_ZTIFiP7_JavaVME",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JavaVME",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3395,18 +3395,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-493"
+     "referenced_type" : "_ZTIP7_JavaVM"
     },
     {
-     "referenced_type" : "type-502"
+     "referenced_type" : "_ZTIPP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "referenced_type" : "type-501",
-   "return_type" : "type-16",
-   "self_type" : "type-501",
+   "referenced_type" : "_ZTIFiP7_JavaVMPP7_JNIEnvPvE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JavaVMPP7_JNIEnvPvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3416,18 +3416,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-493"
+     "referenced_type" : "_ZTIP7_JavaVM"
     },
     {
-     "referenced_type" : "type-505"
+     "referenced_type" : "_ZTIPPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-504",
-   "return_type" : "type-16",
-   "self_type" : "type-504",
+   "referenced_type" : "_ZTIFiP7_JavaVMPPviE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JavaVMPPviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3437,21 +3437,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-551"
+     "referenced_type" : "_ZTIPPKc"
     },
     {
-     "referenced_type" : "type-525"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "referenced_type" : "type-550",
-   "return_type" : "type-16",
-   "self_type" : "type-550",
+   "referenced_type" : "_ZTIFiP8AIBinderiPPKcjE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP8AIBinderiPPKcjE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -3461,21 +3461,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-525"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-541"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
-     "referenced_type" : "type-544"
+     "referenced_type" : "_ZTIP7AParcel"
     }
    ],
-   "referenced_type" : "type-547",
-   "return_type" : "type-16",
-   "self_type" : "type-547",
+   "referenced_type" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -3485,18 +3485,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-525"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "referenced_type" : "type-596",
-   "return_type" : "type-16",
-   "self_type" : "type-596",
+   "referenced_type" : "_ZTIFiPK7AParcelPvjE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiPK7AParcelPvjE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -3506,21 +3506,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-268",
-   "return_type" : "type-77",
-   "self_type" : "type-268",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3530,21 +3530,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-266",
-   "return_type" : "type-77",
-   "self_type" : "type-266",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3554,18 +3554,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-264",
-   "return_type" : "type-77",
-   "self_type" : "type-264",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3575,18 +3575,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-308",
-   "return_type" : "type-77",
-   "self_type" : "type-308",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3596,21 +3596,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-116",
-   "return_type" : "type-77",
-   "self_type" : "type-116",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3620,21 +3620,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-114",
-   "return_type" : "type-77",
-   "self_type" : "type-114",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3644,18 +3644,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-112",
-   "return_type" : "type-77",
-   "self_type" : "type-112",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3665,24 +3665,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-176",
-   "return_type" : "type-77",
-   "self_type" : "type-176",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3692,24 +3692,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-174",
-   "return_type" : "type-77",
-   "self_type" : "type-174",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3719,21 +3719,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-172",
-   "return_type" : "type-77",
-   "self_type" : "type-172",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3743,18 +3743,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-218",
-   "return_type" : "type-77",
-   "self_type" : "type-218",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3764,21 +3764,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-262",
-   "return_type" : "type-76",
-   "self_type" : "type-262",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3788,21 +3788,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-260",
-   "return_type" : "type-76",
-   "self_type" : "type-260",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3812,18 +3812,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-258",
-   "return_type" : "type-76",
-   "self_type" : "type-258",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3833,18 +3833,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-306",
-   "return_type" : "type-76",
-   "self_type" : "type-306",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3854,21 +3854,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-110",
-   "return_type" : "type-76",
-   "self_type" : "type-110",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3878,21 +3878,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-108",
-   "return_type" : "type-76",
-   "self_type" : "type-108",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3902,18 +3902,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-106",
-   "return_type" : "type-76",
-   "self_type" : "type-106",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3923,24 +3923,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-170",
-   "return_type" : "type-76",
-   "self_type" : "type-170",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3950,24 +3950,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-168",
-   "return_type" : "type-76",
-   "self_type" : "type-168",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3977,21 +3977,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-166",
-   "return_type" : "type-76",
-   "self_type" : "type-166",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4001,18 +4001,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-216",
-   "return_type" : "type-76",
-   "self_type" : "type-216",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4022,12 +4022,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     }
    ],
-   "referenced_type" : "type-55",
-   "return_type" : "type-13",
-   "self_type" : "type-55",
+   "referenced_type" : "_ZTIFvP7_JNIEnvE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4037,21 +4037,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-384"
+     "referenced_type" : "_ZTIP10_jintArray"
     },
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "_ZTIPi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-430",
-   "return_type" : "type-13",
-   "self_type" : "type-430",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayPiiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP10_jintArrayPiiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4061,24 +4061,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-384"
+     "referenced_type" : "_ZTIP10_jintArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-467"
+     "referenced_type" : "_ZTIPKi"
     }
    ],
-   "referenced_type" : "type-466",
-   "return_type" : "type-13",
-   "self_type" : "type-466",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPKiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPKiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4088,24 +4088,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-384"
+     "referenced_type" : "_ZTIP10_jintArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "_ZTIPi"
     }
    ],
-   "referenced_type" : "type-446",
-   "return_type" : "type-13",
-   "self_type" : "type-446",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4115,21 +4115,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-372"
+     "referenced_type" : "_ZTIP11_jbyteArray"
     },
     {
-     "referenced_type" : "type-402"
+     "referenced_type" : "_ZTIPa"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-424",
-   "return_type" : "type-13",
-   "self_type" : "type-424",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayPaiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayPaiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4139,24 +4139,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-372"
+     "referenced_type" : "_ZTIP11_jbyteArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "_ZTIPKa"
     }
    ],
-   "referenced_type" : "type-458",
-   "return_type" : "type-13",
-   "self_type" : "type-458",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPKaE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPKaE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4166,24 +4166,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-372"
+     "referenced_type" : "_ZTIP11_jbyteArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-402"
+     "referenced_type" : "_ZTIPa"
     }
    ],
-   "referenced_type" : "type-440",
-   "return_type" : "type-13",
-   "self_type" : "type-440",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPaE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPaE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4193,21 +4193,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-376"
+     "referenced_type" : "_ZTIP11_jcharArray"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "_ZTIPt"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-426",
-   "return_type" : "type-13",
-   "self_type" : "type-426",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayPtiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayPtiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4217,24 +4217,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-376"
+     "referenced_type" : "_ZTIP11_jcharArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-339"
+     "referenced_type" : "_ZTIPKt"
     }
    ],
-   "referenced_type" : "type-460",
-   "return_type" : "type-13",
-   "self_type" : "type-460",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPKtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPKtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4244,24 +4244,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-376"
+     "referenced_type" : "_ZTIP11_jcharArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "_ZTIPt"
     }
    ],
-   "referenced_type" : "type-442",
-   "return_type" : "type-13",
-   "self_type" : "type-442",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4271,21 +4271,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-388"
+     "referenced_type" : "_ZTIP11_jlongArray"
     },
     {
-     "referenced_type" : "type-414"
+     "referenced_type" : "_ZTIPx"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-432",
-   "return_type" : "type-13",
-   "self_type" : "type-432",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayPxiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayPxiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4295,24 +4295,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-388"
+     "referenced_type" : "_ZTIP11_jlongArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-471"
+     "referenced_type" : "_ZTIPKx"
     }
    ],
-   "referenced_type" : "type-470",
-   "return_type" : "type-13",
-   "self_type" : "type-470",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPKxE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPKxE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4322,24 +4322,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-388"
+     "referenced_type" : "_ZTIP11_jlongArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-414"
+     "referenced_type" : "_ZTIPx"
     }
    ],
-   "referenced_type" : "type-448",
-   "return_type" : "type-13",
-   "self_type" : "type-448",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPxE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPxE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4349,21 +4349,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-392"
+     "referenced_type" : "_ZTIP12_jfloatArray"
     },
     {
-     "referenced_type" : "type-417"
+     "referenced_type" : "_ZTIPf"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-434",
-   "return_type" : "type-13",
-   "self_type" : "type-434",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayPfiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayPfiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4373,24 +4373,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-392"
+     "referenced_type" : "_ZTIP12_jfloatArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "_ZTIPKf"
     }
    ],
-   "referenced_type" : "type-474",
-   "return_type" : "type-13",
-   "self_type" : "type-474",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPKfE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPKfE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4400,24 +4400,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-392"
+     "referenced_type" : "_ZTIP12_jfloatArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-417"
+     "referenced_type" : "_ZTIPf"
     }
    ],
-   "referenced_type" : "type-450",
-   "return_type" : "type-13",
-   "self_type" : "type-450",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPfE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPfE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4427,21 +4427,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-380"
+     "referenced_type" : "_ZTIP12_jshortArray"
     },
     {
-     "referenced_type" : "type-408"
+     "referenced_type" : "_ZTIPs"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-428",
-   "return_type" : "type-13",
-   "self_type" : "type-428",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayPsiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayPsiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4451,24 +4451,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-380"
+     "referenced_type" : "_ZTIP12_jshortArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-463"
+     "referenced_type" : "_ZTIPKs"
     }
    ],
-   "referenced_type" : "type-462",
-   "return_type" : "type-13",
-   "self_type" : "type-462",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPKsE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPKsE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4478,24 +4478,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-380"
+     "referenced_type" : "_ZTIP12_jshortArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-408"
+     "referenced_type" : "_ZTIPs"
     }
    ],
-   "referenced_type" : "type-444",
-   "return_type" : "type-13",
-   "self_type" : "type-444",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPsE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPsE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4505,21 +4505,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-396"
+     "referenced_type" : "_ZTIP13_jdoubleArray"
     },
     {
-     "referenced_type" : "type-420"
+     "referenced_type" : "_ZTIPd"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-436",
-   "return_type" : "type-13",
-   "self_type" : "type-436",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayPdiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayPdiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4529,24 +4529,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-396"
+     "referenced_type" : "_ZTIP13_jdoubleArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-479"
+     "referenced_type" : "_ZTIPKd"
     }
    ],
-   "referenced_type" : "type-478",
-   "return_type" : "type-13",
-   "self_type" : "type-478",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4556,24 +4556,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-396"
+     "referenced_type" : "_ZTIP13_jdoubleArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-420"
+     "referenced_type" : "_ZTIPd"
     }
    ],
-   "referenced_type" : "type-452",
-   "return_type" : "type-13",
-   "self_type" : "type-452",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPdE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPdE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4583,21 +4583,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-360"
+     "referenced_type" : "_ZTIP13_jobjectArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-365",
-   "return_type" : "type-13",
-   "self_type" : "type-365",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4607,21 +4607,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "_ZTIP14_jbooleanArray"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-422",
-   "return_type" : "type-13",
-   "self_type" : "type-422",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayPhiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayPhiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4631,24 +4631,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "_ZTIP14_jbooleanArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-455"
+     "referenced_type" : "_ZTIPKh"
     }
    ],
-   "referenced_type" : "type-454",
-   "return_type" : "type-13",
-   "self_type" : "type-454",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4658,24 +4658,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "_ZTIP14_jbooleanArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-438",
-   "return_type" : "type-13",
-   "self_type" : "type-438",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPhE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4685,21 +4685,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-356"
+     "referenced_type" : "_ZTIP7_jarray"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-513",
-   "return_type" : "type-13",
-   "self_type" : "type-513",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jarrayPviE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jarrayPviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4709,21 +4709,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-298",
-   "return_type" : "type-13",
-   "self_type" : "type-298",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4733,21 +4733,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-296",
-   "return_type" : "type-13",
-   "self_type" : "type-296",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4757,18 +4757,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-294",
-   "return_type" : "type-13",
-   "self_type" : "type-294",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4778,21 +4778,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-318",
-   "return_type" : "type-13",
-   "self_type" : "type-318",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4802,21 +4802,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-26"
+     "referenced_type" : "_ZTIa"
     }
    ],
-   "referenced_type" : "type-322",
-   "return_type" : "type-13",
-   "self_type" : "type-322",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4826,21 +4826,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "_ZTId"
     }
    ],
-   "referenced_type" : "type-334",
-   "return_type" : "type-13",
-   "self_type" : "type-334",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4850,21 +4850,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-79"
+     "referenced_type" : "_ZTIf"
     }
    ],
-   "referenced_type" : "type-332",
-   "return_type" : "type-13",
-   "self_type" : "type-332",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4874,21 +4874,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     }
    ],
-   "referenced_type" : "type-320",
-   "return_type" : "type-13",
-   "self_type" : "type-320",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4898,21 +4898,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-328",
-   "return_type" : "type-13",
-   "self_type" : "type-328",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4922,21 +4922,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-77"
+     "referenced_type" : "_ZTIs"
     }
    ],
-   "referenced_type" : "type-326",
-   "return_type" : "type-13",
-   "self_type" : "type-326",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4946,21 +4946,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "_ZTIt"
     }
    ],
-   "referenced_type" : "type-324",
-   "return_type" : "type-13",
-   "self_type" : "type-324",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4970,21 +4970,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "_ZTIx"
     }
    ],
-   "referenced_type" : "type-330",
-   "return_type" : "type-13",
-   "self_type" : "type-330",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDxE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDxE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4994,15 +4994,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-63",
-   "return_type" : "type-13",
-   "self_type" : "type-63",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5012,21 +5012,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-146",
-   "return_type" : "type-13",
-   "self_type" : "type-146",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5036,21 +5036,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-144",
-   "return_type" : "type-13",
-   "self_type" : "type-144",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5060,18 +5060,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-142",
-   "return_type" : "type-13",
-   "self_type" : "type-142",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5081,24 +5081,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-206",
-   "return_type" : "type-13",
-   "self_type" : "type-206",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5108,24 +5108,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-204",
-   "return_type" : "type-13",
-   "self_type" : "type-204",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5135,21 +5135,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-202",
-   "return_type" : "type-13",
-   "self_type" : "type-202",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5159,21 +5159,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-228",
-   "return_type" : "type-13",
-   "self_type" : "type-228",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5183,21 +5183,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-26"
+     "referenced_type" : "_ZTIa"
     }
    ],
-   "referenced_type" : "type-232",
-   "return_type" : "type-13",
-   "self_type" : "type-232",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5207,21 +5207,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "_ZTId"
     }
    ],
-   "referenced_type" : "type-244",
-   "return_type" : "type-13",
-   "self_type" : "type-244",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5231,21 +5231,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-79"
+     "referenced_type" : "_ZTIf"
     }
    ],
-   "referenced_type" : "type-242",
-   "return_type" : "type-13",
-   "self_type" : "type-242",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5255,21 +5255,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     }
    ],
-   "referenced_type" : "type-230",
-   "return_type" : "type-13",
-   "self_type" : "type-230",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5279,21 +5279,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-238",
-   "return_type" : "type-13",
-   "self_type" : "type-238",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5303,21 +5303,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-77"
+     "referenced_type" : "_ZTIs"
     }
    ],
-   "referenced_type" : "type-236",
-   "return_type" : "type-13",
-   "self_type" : "type-236",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5327,21 +5327,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "_ZTIt"
     }
    ],
-   "referenced_type" : "type-234",
-   "return_type" : "type-13",
-   "self_type" : "type-234",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5351,21 +5351,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "_ZTIx"
     }
    ],
-   "referenced_type" : "type-240",
-   "return_type" : "type-13",
-   "self_type" : "type-240",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDxE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDxE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5375,18 +5375,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-337"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-353",
-   "return_type" : "type-13",
-   "self_type" : "type-353",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringPKcE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jstringPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5396,18 +5396,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-337"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-339"
+     "referenced_type" : "_ZTIPKt"
     }
    ],
-   "referenced_type" : "type-347",
-   "return_type" : "type-13",
-   "self_type" : "type-347",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringPKtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jstringPKtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5417,24 +5417,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-337"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-509",
-   "return_type" : "type-13",
-   "self_type" : "type-509",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPcE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5444,24 +5444,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-337"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "_ZTIPt"
     }
    ],
-   "referenced_type" : "type-507",
-   "return_type" : "type-13",
-   "self_type" : "type-507",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5471,15 +5471,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-57",
-   "return_type" : "type-13",
-   "self_type" : "type-57",
+   "referenced_type" : "_ZTIFvP7_JNIEnvPKcE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5489,12 +5489,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "referenced_type" : "type-559",
-   "return_type" : "type-13",
-   "self_type" : "type-559",
+   "referenced_type" : "_ZTIFvPvE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvPvE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5504,18 +5504,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-525"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-556"
+     "referenced_type" : "_ZTIb"
     }
    ],
-   "referenced_type" : "type-636",
-   "return_type" : "type-13",
-   "self_type" : "type-636",
+   "referenced_type" : "_ZTIFvPvjbE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvPvjbE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -5525,21 +5525,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-280",
-   "return_type" : "type-78",
-   "self_type" : "type-280",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5549,21 +5549,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-278",
-   "return_type" : "type-78",
-   "self_type" : "type-278",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5573,18 +5573,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-276",
-   "return_type" : "type-78",
-   "self_type" : "type-276",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5594,18 +5594,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-312",
-   "return_type" : "type-78",
-   "self_type" : "type-312",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5615,15 +5615,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-521",
-   "return_type" : "type-78",
-   "self_type" : "type-521",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5633,21 +5633,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-128",
-   "return_type" : "type-78",
-   "self_type" : "type-128",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5657,21 +5657,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-126",
-   "return_type" : "type-78",
-   "self_type" : "type-126",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5681,18 +5681,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-124",
-   "return_type" : "type-78",
-   "self_type" : "type-124",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5702,24 +5702,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-188",
-   "return_type" : "type-78",
-   "self_type" : "type-188",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5729,24 +5729,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-186",
-   "return_type" : "type-78",
-   "self_type" : "type-186",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5756,21 +5756,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-184",
-   "return_type" : "type-78",
-   "self_type" : "type-184",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5780,18 +5780,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-222",
-   "return_type" : "type-78",
-   "self_type" : "type-222",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   }
  ],
@@ -5800,7 +5800,7 @@
   {
    "function_name" : "ABinderProcess_joinThreadPool",
    "linker_set_key" : "ABinderProcess_joinThreadPool",
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_process.h"
   },
   {
@@ -5809,16 +5809,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-525"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "type-556",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_process.h"
   },
   {
    "function_name" : "ABinderProcess_startThreadPool",
    "linker_set_key" : "ABinderProcess_startThreadPool",
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_process.h"
   },
   {
@@ -5827,19 +5827,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-568"
+     "referenced_type" : "_ZTIPFPvS_E"
     },
     {
-     "referenced_type" : "type-605"
+     "referenced_type" : "_ZTIPFvPvE"
     },
     {
-     "referenced_type" : "type-546"
+     "referenced_type" : "_ZTIPFiP8AIBinderjPK7AParcelPS1_E"
     }
    ],
-   "return_type" : "type-1",
+   "return_type" : "_ZTIP14AIBinder_Class",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5848,13 +5848,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1"
+     "referenced_type" : "_ZTIP14AIBinder_Class"
     },
     {
-     "referenced_type" : "type-552"
+     "referenced_type" : "_ZTIPFiP8AIBinderiPPKcjE"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5863,10 +5863,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-561"
+     "referenced_type" : "_ZTIP23AIBinder_DeathRecipient"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5875,10 +5875,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-605"
+     "referenced_type" : "_ZTIPFvPvE"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "_ZTIP23AIBinder_DeathRecipient",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5887,10 +5887,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-564"
+     "referenced_type" : "_ZTIP13AIBinder_Weak"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5899,10 +5899,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-564",
+   "return_type" : "_ZTIP13AIBinder_Weak",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5911,10 +5911,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-564"
+     "referenced_type" : "_ZTIP13AIBinder_Weak"
     }
    ],
-   "return_type" : "type-548",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5923,13 +5923,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIPK14AIBinder_Class"
     }
    ],
-   "return_type" : "type-556",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5938,10 +5938,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5950,10 +5950,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5962,19 +5962,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-551"
+     "referenced_type" : "_ZTIPPKc"
     },
     {
-     "referenced_type" : "type-525"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5983,25 +5983,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "type-573",
+   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder_jni.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
   },
   {
    "function_name" : "AIBinder_getCallingPid",
    "linker_set_key" : "AIBinder_getCallingPid",
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
    "function_name" : "AIBinder_getCallingUid",
    "linker_set_key" : "AIBinder_getCallingUid",
-   "return_type" : "type-525",
+   "return_type" : "_ZTIj",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6010,10 +6010,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-555",
+   "return_type" : "_ZTIPK14AIBinder_Class",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6022,13 +6022,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-566"
+     "referenced_type" : "_ZTIPP8AIBinder"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6037,10 +6037,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "_ZTIPv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6049,10 +6049,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6061,10 +6061,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-560"
+     "referenced_type" : "_ZTIPK8AIBinder"
     }
    ],
-   "return_type" : "type-556",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6073,10 +6073,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-560"
+     "referenced_type" : "_ZTIPK8AIBinder"
     }
    ],
-   "return_type" : "type-556",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6085,16 +6085,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-561"
+     "referenced_type" : "_ZTIP23AIBinder_DeathRecipient"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6103,10 +6103,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-645"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/stability.sdump"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h"
   },
   {
@@ -6115,10 +6115,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-645"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/stability.sdump"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h"
   },
   {
@@ -6127,13 +6127,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIPK14AIBinder_Class"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "return_type" : "type-548",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6142,10 +6142,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6154,13 +6154,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-563"
+     "referenced_type" : "_ZTIPP7AParcel"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6169,13 +6169,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6184,13 +6184,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-573"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder_jni.sdump"
     }
    ],
-   "return_type" : "type-5",
+   "return_type" : "_ZTIP8_jobject",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
   },
   {
@@ -6199,22 +6199,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-525"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-563"
+     "referenced_type" : "_ZTIPP7AParcel"
     },
     {
-     "referenced_type" : "type-563"
+     "referenced_type" : "_ZTIPP7AParcel"
     },
     {
-     "referenced_type" : "type-525"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6223,16 +6223,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-561"
+     "referenced_type" : "_ZTIP23AIBinder_DeathRecipient"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6241,10 +6241,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6253,10 +6253,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6265,13 +6265,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "_ZTIPb"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6280,19 +6280,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIPFbPviE"
     },
     {
-     "referenced_type" : "type-637"
+     "referenced_type" : "_ZTIPFvPvjbE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6301,13 +6301,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-402"
+     "referenced_type" : "_ZTIPa"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6316,16 +6316,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-644"
+     "referenced_type" : "_ZTIPFbPviPPaE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6334,13 +6334,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-607"
+     "referenced_type" : "_ZTIPDs"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6349,16 +6349,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPFbPviPPDsE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6367,13 +6367,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-420"
+     "referenced_type" : "_ZTIPd"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6382,16 +6382,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-635"
+     "referenced_type" : "_ZTIPFbPviPPdE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6400,13 +6400,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-417"
+     "referenced_type" : "_ZTIPf"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6415,16 +6415,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIPFbPviPPfE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6433,13 +6433,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "_ZTIPi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6448,16 +6448,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-618"
+     "referenced_type" : "_ZTIPFbPviPPiE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6466,13 +6466,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-414"
+     "referenced_type" : "_ZTIPx"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6481,16 +6481,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-624"
+     "referenced_type" : "_ZTIPFbPviPPxE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6499,13 +6499,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "_ZTIPi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6514,19 +6514,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIPFbPviE"
     },
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPFiPK7AParcelPvjE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6535,13 +6535,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-580"
+     "referenced_type" : "_ZTIPP7AStatus"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6550,16 +6550,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-583"
+     "referenced_type" : "_ZTIPFbPviPPcE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6568,19 +6568,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIPFbPviE"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "_ZTIPFbPvjiPPcE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6589,13 +6589,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-638"
+     "referenced_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6604,13 +6604,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-603"
+     "referenced_type" : "_ZTIPj"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6619,16 +6619,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-621"
+     "referenced_type" : "_ZTIPFbPviPPjE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6637,13 +6637,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-604"
+     "referenced_type" : "_ZTIPy"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6652,16 +6652,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "_ZTIPFbPviPPyE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6670,13 +6670,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6685,13 +6685,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-556"
+     "referenced_type" : "_ZTIb"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6700,19 +6700,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-585"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-613"
+     "referenced_type" : "_ZTIPFbPKvjE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6721,13 +6721,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-26"
+     "referenced_type" : "_ZTIa"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6736,16 +6736,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "_ZTIPKa"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6754,13 +6754,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-602"
+     "referenced_type" : "_ZTIDs"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6769,16 +6769,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-615"
+     "referenced_type" : "_ZTIPKDs"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6787,13 +6787,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "_ZTId"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6802,16 +6802,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-479"
+     "referenced_type" : "_ZTIPKd"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6820,13 +6820,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-79"
+     "referenced_type" : "_ZTIf"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6835,16 +6835,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "_ZTIPKf"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6853,13 +6853,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6868,16 +6868,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-467"
+     "referenced_type" : "_ZTIPKi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6886,13 +6886,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "_ZTIx"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6901,16 +6901,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-471"
+     "referenced_type" : "_ZTIPKx"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6919,13 +6919,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6934,19 +6934,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-585"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-595"
+     "referenced_type" : "_ZTIPFiP7AParcelPKvjE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6955,13 +6955,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-577"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6970,16 +6970,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6988,19 +6988,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-585"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-587"
+     "referenced_type" : "_ZTIPFPKcPKvjPiE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7009,13 +7009,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-627"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7024,13 +7024,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-525"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7039,16 +7039,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-609"
+     "referenced_type" : "_ZTIPKj"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7057,13 +7057,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-601"
+     "referenced_type" : "_ZTIy"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7072,16 +7072,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-611"
+     "referenced_type" : "_ZTIPKy"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7090,13 +7090,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-652"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7105,10 +7105,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-652",
+   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7117,10 +7117,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-652",
+   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7129,10 +7129,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-647"
+     "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7141,10 +7141,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7153,10 +7153,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-647",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7165,13 +7165,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-647",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7180,10 +7180,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-647",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7192,13 +7192,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-647",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7207,10 +7207,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-647",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7219,10 +7219,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-651"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-21",
+   "return_type" : "_ZTIPKc",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7231,10 +7231,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-651"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7243,10 +7243,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-651"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-21",
+   "return_type" : "_ZTIPKc",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7255,10 +7255,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-651"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7267,10 +7267,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-651"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7279,16 +7279,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-651"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-556",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
    "function_name" : "AStatus_newOk",
    "linker_set_key" : "AStatus_newOk",
-   "return_type" : "type-647",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   }
  ],
@@ -7300,8 +7300,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP10_jintArray",
    "name" : "_jintArray *",
-   "referenced_type" : "type-385",
-   "self_type" : "type-384",
+   "referenced_type" : "_ZTI10_jintArray",
+   "self_type" : "_ZTIP10_jintArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7309,17 +7309,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP10_jmethodID",
    "name" : "_jmethodID *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-31",
-   "size" : 4,
-   "source_file" : "/libnativehelper/include_jni/jni.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP10_jmethodID",
-   "name" : "_jmethodID *",
-   "referenced_type" : "type-676",
-   "self_type" : "type-675",
+   "referenced_type" : "_ZTI10_jmethodID",
+   "self_type" : "_ZTIP10_jmethodID",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7327,8 +7318,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP11_jbyteArray",
    "name" : "_jbyteArray *",
-   "referenced_type" : "type-373",
-   "self_type" : "type-372",
+   "referenced_type" : "_ZTI11_jbyteArray",
+   "self_type" : "_ZTIP11_jbyteArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7336,8 +7327,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP11_jcharArray",
    "name" : "_jcharArray *",
-   "referenced_type" : "type-377",
-   "self_type" : "type-376",
+   "referenced_type" : "_ZTI11_jcharArray",
+   "self_type" : "_ZTIP11_jcharArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7345,8 +7336,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP11_jlongArray",
    "name" : "_jlongArray *",
-   "referenced_type" : "type-389",
-   "self_type" : "type-388",
+   "referenced_type" : "_ZTI11_jlongArray",
+   "self_type" : "_ZTIP11_jlongArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7354,8 +7345,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP11_jthrowable",
    "name" : "_jthrowable *",
-   "referenced_type" : "type-49",
-   "self_type" : "type-48",
+   "referenced_type" : "_ZTI11_jthrowable",
+   "self_type" : "_ZTIP11_jthrowable",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7363,8 +7354,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP12JavaVMOption",
    "name" : "JavaVMOption *",
-   "referenced_type" : "type-570",
-   "self_type" : "type-572",
+   "referenced_type" : "_ZTI12JavaVMOption",
+   "self_type" : "_ZTIP12JavaVMOption",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7372,8 +7363,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP12_jfloatArray",
    "name" : "_jfloatArray *",
-   "referenced_type" : "type-393",
-   "self_type" : "type-392",
+   "referenced_type" : "_ZTI12_jfloatArray",
+   "self_type" : "_ZTIP12_jfloatArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7381,8 +7372,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP12_jshortArray",
    "name" : "_jshortArray *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-380",
+   "referenced_type" : "_ZTI12_jshortArray",
+   "self_type" : "_ZTIP12_jshortArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7390,17 +7381,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP13AIBinder_Weak",
    "name" : "AIBinder_Weak *",
-   "referenced_type" : "type-565",
-   "self_type" : "type-564",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP13AIBinder_Weak",
-   "name" : "AIBinder_Weak *",
-   "referenced_type" : "type-673",
-   "self_type" : "type-672",
+   "referenced_type" : "_ZTI13AIBinder_Weak",
+   "self_type" : "_ZTIP13AIBinder_Weak",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -7408,8 +7390,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP13_jdoubleArray",
    "name" : "_jdoubleArray *",
-   "referenced_type" : "type-397",
-   "self_type" : "type-396",
+   "referenced_type" : "_ZTI13_jdoubleArray",
+   "self_type" : "_ZTIP13_jdoubleArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7417,8 +7399,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP13_jobjectArray",
    "name" : "_jobjectArray *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-360",
+   "referenced_type" : "_ZTI13_jobjectArray",
+   "self_type" : "_ZTIP13_jobjectArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7426,17 +7408,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP14AIBinder_Class",
    "name" : "AIBinder_Class *",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP14AIBinder_Class",
-   "name" : "AIBinder_Class *",
-   "referenced_type" : "type-655",
-   "self_type" : "type-654",
+   "referenced_type" : "_ZTI14AIBinder_Class",
+   "self_type" : "_ZTIP14AIBinder_Class",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -7444,8 +7417,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP14_jbooleanArray",
    "name" : "_jbooleanArray *",
-   "referenced_type" : "type-369",
-   "self_type" : "type-368",
+   "referenced_type" : "_ZTI14_jbooleanArray",
+   "self_type" : "_ZTIP14_jbooleanArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7453,26 +7426,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP23AIBinder_DeathRecipient",
    "name" : "AIBinder_DeathRecipient *",
-   "referenced_type" : "type-562",
-   "self_type" : "type-561",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP23AIBinder_DeathRecipient",
-   "name" : "AIBinder_DeathRecipient *",
-   "referenced_type" : "type-670",
-   "self_type" : "type-669",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP7AParcel",
-   "name" : "AParcel *",
-   "referenced_type" : "type-545",
-   "self_type" : "type-544",
+   "referenced_type" : "_ZTI23AIBinder_DeathRecipient",
+   "self_type" : "_ZTIP23AIBinder_DeathRecipient",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -7480,62 +7435,17 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP7AParcel",
    "name" : "AParcel *",
-   "referenced_type" : "type-589",
-   "self_type" : "type-588",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP7AParcel",
-   "name" : "AParcel *",
-   "referenced_type" : "type-662",
-   "self_type" : "type-661",
+   "referenced_type" : "_ZTI7AParcel",
+   "self_type" : "_ZTIP7AParcel",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP7AParcel",
-   "name" : "AParcel *",
-   "referenced_type" : "type-688",
-   "self_type" : "type-687",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP7AStatus",
-   "name" : "AStatus *",
-   "referenced_type" : "type-535",
-   "self_type" : "type-534",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP7AStatus",
-   "name" : "AStatus *",
-   "referenced_type" : "type-579",
-   "self_type" : "type-578",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP7AStatus",
    "name" : "AStatus *",
-   "referenced_type" : "type-648",
-   "self_type" : "type-647",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP7AStatus",
-   "name" : "AStatus *",
-   "referenced_type" : "type-685",
-   "self_type" : "type-684",
+   "referenced_type" : "_ZTI7AStatus",
+   "self_type" : "_ZTIP7AStatus",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -7543,8 +7453,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP7_JNIEnv",
    "name" : "_JNIEnv *",
-   "referenced_type" : "type-8",
-   "self_type" : "type-7",
+   "referenced_type" : "_ZTI7_JNIEnv",
+   "self_type" : "_ZTIP7_JNIEnv",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7552,8 +7462,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP7_JavaVM",
    "name" : "_JavaVM *",
-   "referenced_type" : "type-494",
-   "self_type" : "type-493",
+   "referenced_type" : "_ZTI7_JavaVM",
+   "self_type" : "_ZTIP7_JavaVM",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7561,8 +7471,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP7_jarray",
    "name" : "_jarray *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-356",
+   "referenced_type" : "_ZTI7_jarray",
+   "self_type" : "_ZTIP7_jarray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7570,8 +7480,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP7_jclass",
    "name" : "_jclass *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-19",
+   "referenced_type" : "_ZTI7_jclass",
+   "self_type" : "_ZTIP7_jclass",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7579,98 +7489,17 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP8AIBinder",
    "name" : "AIBinder *",
-   "referenced_type" : "type-530",
-   "self_type" : "type-529",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-533",
-   "self_type" : "type-532",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-540",
-   "self_type" : "type-539",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-549",
-   "self_type" : "type-548",
+   "referenced_type" : "_ZTI8AIBinder",
+   "self_type" : "_ZTIP8AIBinder",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-574",
-   "self_type" : "type-573",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-628",
-   "self_type" : "type-627",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-646",
-   "self_type" : "type-645",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-653",
-   "self_type" : "type-652",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-657",
-   "self_type" : "type-656",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-680",
-   "self_type" : "type-679",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP8_jobject",
    "name" : "_jobject *",
-   "referenced_type" : "type-6",
-   "self_type" : "type-5",
+   "referenced_type" : "_ZTI8_jobject",
+   "self_type" : "_ZTIP8_jobject",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7678,17 +7507,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP8_jstring",
    "name" : "_jstring *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-337",
-   "size" : 4,
-   "source_file" : "/libnativehelper/include_jni/jni.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP9_jfieldID",
-   "name" : "_jfieldID *",
-   "referenced_type" : "type-36",
-   "self_type" : "type-35",
+   "referenced_type" : "_ZTI8_jstring",
+   "self_type" : "_ZTIP8_jstring",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7696,8 +7516,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP9_jfieldID",
    "name" : "_jfieldID *",
-   "referenced_type" : "type-678",
-   "self_type" : "type-677",
+   "referenced_type" : "_ZTI9_jfieldID",
+   "self_type" : "_ZTIP9_jfieldID",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7705,8 +7525,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPDs",
    "name" : "char16_t *",
-   "referenced_type" : "type-602",
-   "self_type" : "type-607",
+   "referenced_type" : "_ZTIDs",
+   "self_type" : "_ZTIPDs",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -7714,8 +7534,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
    "name" : "jobjectRefType (*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-523",
-   "self_type" : "type-522",
+   "referenced_type" : "_ZTIF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7723,8 +7543,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP10_jintArrayP7_JNIEnviE",
    "name" : "_jintArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-383",
-   "self_type" : "type-382",
+   "referenced_type" : "_ZTIFP10_jintArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP10_jintArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7732,8 +7552,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
    "name" : "_jmethodID *(*)(_JNIEnv *, _jclass *, const char *, const char *)",
-   "referenced_type" : "type-86",
-   "self_type" : "type-85",
+   "referenced_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
+   "self_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7741,8 +7561,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP10_jmethodIDP7_JNIEnvP8_jobjectE",
    "name" : "_jmethodID *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-30",
-   "self_type" : "type-29",
+   "referenced_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7750,8 +7570,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP11_jbyteArrayP7_JNIEnviE",
    "name" : "_jbyteArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-371",
-   "self_type" : "type-370",
+   "referenced_type" : "_ZTIFP11_jbyteArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP11_jbyteArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7759,8 +7579,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP11_jcharArrayP7_JNIEnviE",
    "name" : "_jcharArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-375",
-   "self_type" : "type-374",
+   "referenced_type" : "_ZTIFP11_jcharArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP11_jcharArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7768,8 +7588,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP11_jlongArrayP7_JNIEnviE",
    "name" : "_jlongArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-387",
-   "self_type" : "type-386",
+   "referenced_type" : "_ZTIFP11_jlongArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP11_jlongArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7777,8 +7597,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP11_jthrowableP7_JNIEnvE",
    "name" : "_jthrowable *(*)(_JNIEnv *)",
-   "referenced_type" : "type-53",
-   "self_type" : "type-52",
+   "referenced_type" : "_ZTIFP11_jthrowableP7_JNIEnvE",
+   "self_type" : "_ZTIPFP11_jthrowableP7_JNIEnvE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7786,8 +7606,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP12_jfloatArrayP7_JNIEnviE",
    "name" : "_jfloatArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-391",
-   "self_type" : "type-390",
+   "referenced_type" : "_ZTIFP12_jfloatArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP12_jfloatArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7795,8 +7615,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP12_jshortArrayP7_JNIEnviE",
    "name" : "_jshortArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-379",
-   "self_type" : "type-378",
+   "referenced_type" : "_ZTIFP12_jshortArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP12_jshortArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7804,8 +7624,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP13_jdoubleArrayP7_JNIEnviE",
    "name" : "_jdoubleArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-395",
-   "self_type" : "type-394",
+   "referenced_type" : "_ZTIFP13_jdoubleArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP13_jdoubleArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7813,8 +7633,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
    "name" : "_jobjectArray *(*)(_JNIEnv *, int, _jclass *, _jobject *)",
-   "referenced_type" : "type-359",
-   "self_type" : "type-358",
+   "referenced_type" : "_ZTIFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
+   "self_type" : "_ZTIPFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7822,8 +7642,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP14_jbooleanArrayP7_JNIEnviE",
    "name" : "_jbooleanArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-367",
-   "self_type" : "type-366",
+   "referenced_type" : "_ZTIFP14_jbooleanArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP14_jbooleanArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7831,8 +7651,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP7_jclassP7_JNIEnvP8_jobjectE",
    "name" : "_jclass *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-82",
-   "self_type" : "type-81",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFP7_jclassP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7840,8 +7660,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP7_jclassP7_JNIEnvPKcE",
    "name" : "_jclass *(*)(_JNIEnv *, const char *)",
-   "referenced_type" : "type-28",
-   "self_type" : "type-27",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvPKcE",
+   "self_type" : "_ZTIPFP7_jclassP7_JNIEnvPKcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7849,8 +7669,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
    "name" : "_jclass *(*)(_JNIEnv *, const char *, _jobject *, const signed char *, int)",
-   "referenced_type" : "type-18",
-   "self_type" : "type-17",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
+   "self_type" : "_ZTIPFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7858,8 +7678,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP7_jclassP7_JNIEnvS0_E",
    "name" : "_jclass *(*)(_JNIEnv *, _jclass *)",
-   "referenced_type" : "type-41",
-   "self_type" : "type-40",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvS0_E",
+   "self_type" : "_ZTIPFP7_jclassP7_JNIEnvS0_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7867,8 +7687,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobjectArray *, int)",
-   "referenced_type" : "type-363",
-   "self_type" : "type-362",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7876,8 +7696,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *)",
-   "referenced_type" : "type-4",
-   "self_type" : "type-3",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7885,8 +7705,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-72",
-   "self_type" : "type-71",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7894,8 +7714,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-69",
-   "self_type" : "type-68",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7903,8 +7723,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jmethodID *, unsigned char)",
-   "referenced_type" : "type-38",
-   "self_type" : "type-37",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7912,8 +7732,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-67",
-   "self_type" : "type-66",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7921,8 +7741,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-300",
-   "self_type" : "type-299",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7930,8 +7750,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jfieldID *, unsigned char)",
-   "referenced_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7939,8 +7759,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvPvxE",
    "name" : "_jobject *(*)(_JNIEnv *, void *, long long)",
-   "referenced_type" : "type-517",
-   "self_type" : "type-516",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvPvxE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvPvxE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7948,8 +7768,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-61",
-   "self_type" : "type-60",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_E",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7957,8 +7777,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-92",
-   "self_type" : "type-91",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7966,8 +7786,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPcE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jmethodID *, char *)",
-   "referenced_type" : "type-90",
-   "self_type" : "type-89",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPcE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7975,8 +7795,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-88",
-   "self_type" : "type-87",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7984,8 +7804,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-152",
-   "self_type" : "type-151",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7993,8 +7813,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPcE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-150",
-   "self_type" : "type-149",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8002,8 +7822,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-148",
-   "self_type" : "type-147",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8011,8 +7831,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-210",
-   "self_type" : "type-209",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8020,8 +7840,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jstringP7_JNIEnvPKcE",
    "name" : "_jstring *(*)(_JNIEnv *, const char *)",
-   "referenced_type" : "type-349",
-   "self_type" : "type-348",
+   "referenced_type" : "_ZTIFP8_jstringP7_JNIEnvPKcE",
+   "self_type" : "_ZTIPFP8_jstringP7_JNIEnvPKcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8029,8 +7849,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jstringP7_JNIEnvPKtiE",
    "name" : "_jstring *(*)(_JNIEnv *, const unsigned short *, int)",
-   "referenced_type" : "type-336",
-   "self_type" : "type-335",
+   "referenced_type" : "_ZTIFP8_jstringP7_JNIEnvPKtiE",
+   "self_type" : "_ZTIPFP8_jstringP7_JNIEnvPKtiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8038,8 +7858,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
    "name" : "_jfieldID *(*)(_JNIEnv *, _jclass *, const char *, const char *)",
-   "referenced_type" : "type-208",
-   "self_type" : "type-207",
+   "referenced_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
+   "self_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8047,8 +7867,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP9_jfieldIDP7_JNIEnvP8_jobjectE",
    "name" : "_jfieldID *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-34",
-   "self_type" : "type-33",
+   "referenced_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8056,8 +7876,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPKcP7_JNIEnvP8_jstringPhE",
    "name" : "const char *(*)(_JNIEnv *, _jstring *, unsigned char *)",
-   "referenced_type" : "type-351",
-   "self_type" : "type-350",
+   "referenced_type" : "_ZTIFPKcP7_JNIEnvP8_jstringPhE",
+   "self_type" : "_ZTIPFPKcP7_JNIEnvP8_jstringPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8065,8 +7885,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPKcPKvjPiE",
    "name" : "const char *(*)(const void *, unsigned int, int *)",
-   "referenced_type" : "type-586",
-   "self_type" : "type-587",
+   "referenced_type" : "_ZTIFPKcPKvjPiE",
+   "self_type" : "_ZTIPFPKcPKvjPiE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8074,8 +7894,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPKtP7_JNIEnvP8_jstringPhE",
    "name" : "const unsigned short *(*)(_JNIEnv *, _jstring *, unsigned char *)",
-   "referenced_type" : "type-344",
-   "self_type" : "type-343",
+   "referenced_type" : "_ZTIFPKtP7_JNIEnvP8_jstringPhE",
+   "self_type" : "_ZTIPFPKtP7_JNIEnvP8_jstringPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8083,8 +7903,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPaP7_JNIEnvP11_jbyteArrayPhE",
    "name" : "signed char *(*)(_JNIEnv *, _jbyteArray *, unsigned char *)",
-   "referenced_type" : "type-401",
-   "self_type" : "type-400",
+   "referenced_type" : "_ZTIFPaP7_JNIEnvP11_jbyteArrayPhE",
+   "self_type" : "_ZTIPFPaP7_JNIEnvP11_jbyteArrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8092,8 +7912,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPdP7_JNIEnvP13_jdoubleArrayPhE",
    "name" : "double *(*)(_JNIEnv *, _jdoubleArray *, unsigned char *)",
-   "referenced_type" : "type-419",
-   "self_type" : "type-418",
+   "referenced_type" : "_ZTIFPdP7_JNIEnvP13_jdoubleArrayPhE",
+   "self_type" : "_ZTIPFPdP7_JNIEnvP13_jdoubleArrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8101,8 +7921,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPfP7_JNIEnvP12_jfloatArrayPhE",
    "name" : "float *(*)(_JNIEnv *, _jfloatArray *, unsigned char *)",
-   "referenced_type" : "type-416",
-   "self_type" : "type-415",
+   "referenced_type" : "_ZTIFPfP7_JNIEnvP12_jfloatArrayPhE",
+   "self_type" : "_ZTIPFPfP7_JNIEnvP12_jfloatArrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8110,8 +7930,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPhP7_JNIEnvP14_jbooleanArrayS_E",
    "name" : "unsigned char *(*)(_JNIEnv *, _jbooleanArray *, unsigned char *)",
-   "referenced_type" : "type-399",
-   "self_type" : "type-398",
+   "referenced_type" : "_ZTIFPhP7_JNIEnvP14_jbooleanArrayS_E",
+   "self_type" : "_ZTIPFPhP7_JNIEnvP14_jbooleanArrayS_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8119,8 +7939,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPiP7_JNIEnvP10_jintArrayPhE",
    "name" : "int *(*)(_JNIEnv *, _jintArray *, unsigned char *)",
-   "referenced_type" : "type-410",
-   "self_type" : "type-409",
+   "referenced_type" : "_ZTIFPiP7_JNIEnvP10_jintArrayPhE",
+   "self_type" : "_ZTIPFPiP7_JNIEnvP10_jintArrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8128,8 +7948,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPsP7_JNIEnvP12_jshortArrayPhE",
    "name" : "short *(*)(_JNIEnv *, _jshortArray *, unsigned char *)",
-   "referenced_type" : "type-407",
-   "self_type" : "type-406",
+   "referenced_type" : "_ZTIFPsP7_JNIEnvP12_jshortArrayPhE",
+   "self_type" : "_ZTIPFPsP7_JNIEnvP12_jshortArrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8137,8 +7957,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPtP7_JNIEnvP11_jcharArrayPhE",
    "name" : "unsigned short *(*)(_JNIEnv *, _jcharArray *, unsigned char *)",
-   "referenced_type" : "type-404",
-   "self_type" : "type-403",
+   "referenced_type" : "_ZTIFPtP7_JNIEnvP11_jcharArrayPhE",
+   "self_type" : "_ZTIPFPtP7_JNIEnvP11_jcharArrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8146,8 +7966,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPvP7_JNIEnvP7_jarrayPhE",
    "name" : "void *(*)(_JNIEnv *, _jarray *, unsigned char *)",
-   "referenced_type" : "type-511",
-   "self_type" : "type-510",
+   "referenced_type" : "_ZTIFPvP7_JNIEnvP7_jarrayPhE",
+   "self_type" : "_ZTIPFPvP7_JNIEnvP7_jarrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8155,8 +7975,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPvP7_JNIEnvP8_jobjectE",
    "name" : "void *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-519",
-   "self_type" : "type-518",
+   "referenced_type" : "_ZTIFPvP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFPvP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8164,8 +7984,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPvS_E",
    "name" : "void *(*)(void *)",
-   "referenced_type" : "type-567",
-   "self_type" : "type-568",
+   "referenced_type" : "_ZTIFPvS_E",
+   "self_type" : "_ZTIPFPvS_E",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -8173,8 +7993,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPxP7_JNIEnvP11_jlongArrayPhE",
    "name" : "long long *(*)(_JNIEnv *, _jlongArray *, unsigned char *)",
-   "referenced_type" : "type-413",
-   "self_type" : "type-412",
+   "referenced_type" : "_ZTIFPxP7_JNIEnvP11_jlongArrayPhE",
+   "self_type" : "_ZTIPFPxP7_JNIEnvP11_jlongArrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8182,8 +8002,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "signed char (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-256",
-   "self_type" : "type-255",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8191,8 +8011,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "name" : "signed char (*)(_JNIEnv *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-254",
-   "self_type" : "type-253",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8200,8 +8020,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "signed char (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-252",
-   "self_type" : "type-251",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8209,8 +8029,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "signed char (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-304",
-   "self_type" : "type-303",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8218,8 +8038,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-104",
-   "self_type" : "type-103",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8227,8 +8047,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jmethodID *, char *)",
-   "referenced_type" : "type-102",
-   "self_type" : "type-101",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8236,8 +8056,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-100",
-   "self_type" : "type-99",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8245,8 +8065,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-164",
-   "self_type" : "type-163",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8254,8 +8074,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-162",
-   "self_type" : "type-161",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8263,8 +8083,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-160",
-   "self_type" : "type-159",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8272,8 +8092,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-214",
-   "self_type" : "type-213",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8281,8 +8101,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPKvjE",
    "name" : "bool (*)(const void *, unsigned int)",
-   "referenced_type" : "type-612",
-   "self_type" : "type-613",
+   "referenced_type" : "_ZTIFbPKvjE",
+   "self_type" : "_ZTIPFbPKvjE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8290,8 +8110,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviE",
    "name" : "bool (*)(void *, int)",
-   "referenced_type" : "type-590",
-   "self_type" : "type-591",
+   "referenced_type" : "_ZTIFbPviE",
+   "self_type" : "_ZTIPFbPviE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8299,8 +8119,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPDsE",
    "name" : "bool (*)(void *, int, char16_t **)",
-   "referenced_type" : "type-639",
-   "self_type" : "type-641",
+   "referenced_type" : "_ZTIFbPviPPDsE",
+   "self_type" : "_ZTIPFbPviPPDsE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8308,8 +8128,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPaE",
    "name" : "bool (*)(void *, int, signed char **)",
-   "referenced_type" : "type-642",
-   "self_type" : "type-644",
+   "referenced_type" : "_ZTIFbPviPPaE",
+   "self_type" : "_ZTIPFbPviPPaE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8317,8 +8137,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPcE",
    "name" : "bool (*)(void *, int, char **)",
-   "referenced_type" : "type-581",
-   "self_type" : "type-583",
+   "referenced_type" : "_ZTIFbPviPPcE",
+   "self_type" : "_ZTIPFbPviPPcE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8326,8 +8146,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPdE",
    "name" : "bool (*)(void *, int, double **)",
-   "referenced_type" : "type-633",
-   "self_type" : "type-635",
+   "referenced_type" : "_ZTIFbPviPPdE",
+   "self_type" : "_ZTIPFbPviPPdE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8335,8 +8155,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPfE",
    "name" : "bool (*)(void *, int, float **)",
-   "referenced_type" : "type-630",
-   "self_type" : "type-632",
+   "referenced_type" : "_ZTIFbPviPPfE",
+   "self_type" : "_ZTIPFbPviPPfE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8344,8 +8164,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPiE",
    "name" : "bool (*)(void *, int, int **)",
-   "referenced_type" : "type-616",
-   "self_type" : "type-618",
+   "referenced_type" : "_ZTIFbPviPPiE",
+   "self_type" : "_ZTIPFbPviPPiE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8353,8 +8173,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPjE",
    "name" : "bool (*)(void *, int, unsigned int **)",
-   "referenced_type" : "type-619",
-   "self_type" : "type-621",
+   "referenced_type" : "_ZTIFbPviPPjE",
+   "self_type" : "_ZTIPFbPviPPjE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8362,8 +8182,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPxE",
    "name" : "bool (*)(void *, int, long long **)",
-   "referenced_type" : "type-622",
-   "self_type" : "type-624",
+   "referenced_type" : "_ZTIFbPviPPxE",
+   "self_type" : "_ZTIPFbPviPPxE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8371,8 +8191,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPyE",
    "name" : "bool (*)(void *, int, unsigned long long **)",
-   "referenced_type" : "type-625",
-   "self_type" : "type-629",
+   "referenced_type" : "_ZTIFbPviPPyE",
+   "self_type" : "_ZTIPFbPviPPyE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8380,8 +8200,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPvjiPPcE",
    "name" : "bool (*)(void *, unsigned int, int, char **)",
-   "referenced_type" : "type-592",
-   "self_type" : "type-593",
+   "referenced_type" : "_ZTIFbPvjiPPcE",
+   "self_type" : "_ZTIPFbPvjiPPcE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8389,8 +8209,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-292",
-   "self_type" : "type-291",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8398,8 +8218,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-290",
-   "self_type" : "type-289",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8407,8 +8227,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-288",
-   "self_type" : "type-287",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8416,8 +8236,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-316",
-   "self_type" : "type-315",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8425,8 +8245,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-140",
-   "self_type" : "type-139",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8434,8 +8254,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jmethodID *, char *)",
-   "referenced_type" : "type-138",
-   "self_type" : "type-137",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8443,8 +8263,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-136",
-   "self_type" : "type-135",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8452,8 +8272,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-200",
-   "self_type" : "type-199",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8461,8 +8281,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-198",
-   "self_type" : "type-197",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8470,8 +8290,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-196",
-   "self_type" : "type-195",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8479,8 +8299,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-226",
-   "self_type" : "type-225",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8488,8 +8308,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "float (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-286",
-   "self_type" : "type-285",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8497,8 +8317,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "name" : "float (*)(_JNIEnv *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-284",
-   "self_type" : "type-283",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8506,8 +8326,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "float (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-282",
-   "self_type" : "type-281",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8515,8 +8335,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "float (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-314",
-   "self_type" : "type-313",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8524,8 +8344,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-134",
-   "self_type" : "type-133",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8533,8 +8353,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jmethodID *, char *)",
-   "referenced_type" : "type-132",
-   "self_type" : "type-131",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8542,8 +8362,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-130",
-   "self_type" : "type-129",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8551,8 +8371,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-194",
-   "self_type" : "type-193",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8560,8 +8380,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-192",
-   "self_type" : "type-191",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8569,8 +8389,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-190",
-   "self_type" : "type-189",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8578,8 +8398,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-224",
-   "self_type" : "type-223",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8587,8 +8407,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvE",
    "name" : "unsigned char (*)(_JNIEnv *)",
-   "referenced_type" : "type-515",
-   "self_type" : "type-514",
+   "referenced_type" : "_ZTIFhP7_JNIEnvE",
+   "self_type" : "_ZTIPFhP7_JNIEnvE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8596,8 +8416,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-250",
-   "self_type" : "type-249",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8605,8 +8425,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-248",
-   "self_type" : "type-247",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8614,8 +8434,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-246",
-   "self_type" : "type-245",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8623,8 +8443,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-302",
-   "self_type" : "type-301",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8632,8 +8452,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassS2_E",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jclass *)",
-   "referenced_type" : "type-43",
-   "self_type" : "type-42",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassS2_E",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassS2_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8641,8 +8461,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-98",
-   "self_type" : "type-97",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8650,8 +8470,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jmethodID *, char *)",
-   "referenced_type" : "type-96",
-   "self_type" : "type-95",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8659,8 +8479,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-94",
-   "self_type" : "type-93",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8668,8 +8488,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jclass *)",
-   "referenced_type" : "type-84",
-   "self_type" : "type-83",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8677,8 +8497,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-158",
-   "self_type" : "type-157",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8686,8 +8506,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-156",
-   "self_type" : "type-155",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8695,8 +8515,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-154",
-   "self_type" : "type-153",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8704,8 +8524,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-212",
-   "self_type" : "type-211",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8713,8 +8533,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectS2_E",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jobject *)",
-   "referenced_type" : "type-65",
-   "self_type" : "type-64",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectS2_E",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectS2_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8722,8 +8542,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7AParcelPKvjE",
    "name" : "int (*)(AParcel *, const void *, unsigned int)",
-   "referenced_type" : "type-594",
-   "self_type" : "type-595",
+   "referenced_type" : "_ZTIFiP7AParcelPKvjE",
+   "self_type" : "_ZTIPFiP7AParcelPKvjE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8731,8 +8551,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvE",
    "name" : "int (*)(_JNIEnv *)",
-   "referenced_type" : "type-15",
-   "self_type" : "type-14",
+   "referenced_type" : "_ZTIFiP7_JNIEnvE",
+   "self_type" : "_ZTIPFiP7_JNIEnvE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8740,8 +8560,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP11_jthrowableE",
    "name" : "int (*)(_JNIEnv *, _jthrowable *)",
-   "referenced_type" : "type-47",
-   "self_type" : "type-46",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP11_jthrowableE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP11_jthrowableE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8749,8 +8569,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jarrayE",
    "name" : "int (*)(_JNIEnv *, _jarray *)",
-   "referenced_type" : "type-355",
-   "self_type" : "type-354",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jarrayE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jarrayE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8758,8 +8578,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassE",
    "name" : "int (*)(_JNIEnv *, _jclass *)",
-   "referenced_type" : "type-487",
-   "self_type" : "type-486",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8767,8 +8587,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "int (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-274",
-   "self_type" : "type-273",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8776,8 +8596,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "name" : "int (*)(_JNIEnv *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-272",
-   "self_type" : "type-271",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8785,8 +8605,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "int (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-270",
-   "self_type" : "type-269",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8794,8 +8614,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "int (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-310",
-   "self_type" : "type-309",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8803,8 +8623,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
    "name" : "int (*)(_JNIEnv *, _jclass *, const JNINativeMethod *, int)",
-   "referenced_type" : "type-482",
-   "self_type" : "type-481",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8812,8 +8632,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassPKcE",
    "name" : "int (*)(_JNIEnv *, _jclass *, const char *)",
-   "referenced_type" : "type-51",
-   "self_type" : "type-50",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassPKcE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassPKcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8821,8 +8641,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectE",
    "name" : "int (*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-489",
-   "self_type" : "type-488",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8830,8 +8650,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-122",
-   "self_type" : "type-121",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8839,8 +8659,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jmethodID *, char *)",
-   "referenced_type" : "type-120",
-   "self_type" : "type-119",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8848,8 +8668,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-118",
-   "self_type" : "type-117",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8857,8 +8677,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-182",
-   "self_type" : "type-181",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8866,8 +8686,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-180",
-   "self_type" : "type-179",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8875,8 +8695,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-178",
-   "self_type" : "type-177",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8884,8 +8704,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-220",
-   "self_type" : "type-219",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8893,8 +8713,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jstringE",
    "name" : "int (*)(_JNIEnv *, _jstring *)",
-   "referenced_type" : "type-342",
-   "self_type" : "type-341",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jstringE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jstringE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8902,8 +8722,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvPP7_JavaVME",
    "name" : "int (*)(_JNIEnv *, _JavaVM **)",
-   "referenced_type" : "type-491",
-   "self_type" : "type-490",
+   "referenced_type" : "_ZTIFiP7_JNIEnvPP7_JavaVME",
+   "self_type" : "_ZTIPFiP7_JNIEnvPP7_JavaVME",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8911,8 +8731,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnviE",
    "name" : "int (*)(_JNIEnv *, int)",
-   "referenced_type" : "type-59",
-   "self_type" : "type-58",
+   "referenced_type" : "_ZTIFiP7_JNIEnviE",
+   "self_type" : "_ZTIPFiP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8920,8 +8740,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JavaVME",
    "name" : "int (*)(_JavaVM *)",
-   "referenced_type" : "type-499",
-   "self_type" : "type-498",
+   "referenced_type" : "_ZTIFiP7_JavaVME",
+   "self_type" : "_ZTIPFiP7_JavaVME",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8929,8 +8749,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JavaVMPP7_JNIEnvPvE",
    "name" : "int (*)(_JavaVM *, _JNIEnv **, void *)",
-   "referenced_type" : "type-501",
-   "self_type" : "type-500",
+   "referenced_type" : "_ZTIFiP7_JavaVMPP7_JNIEnvPvE",
+   "self_type" : "_ZTIPFiP7_JavaVMPP7_JNIEnvPvE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8938,8 +8758,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JavaVMPPviE",
    "name" : "int (*)(_JavaVM *, void **, int)",
-   "referenced_type" : "type-504",
-   "self_type" : "type-503",
+   "referenced_type" : "_ZTIFiP7_JavaVMPPviE",
+   "self_type" : "_ZTIPFiP7_JavaVMPPviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8947,8 +8767,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP8AIBinderiPPKcjE",
    "name" : "int (*)(AIBinder *, int, const char **, unsigned int)",
-   "referenced_type" : "type-550",
-   "self_type" : "type-552",
+   "referenced_type" : "_ZTIFiP8AIBinderiPPKcjE",
+   "self_type" : "_ZTIPFiP8AIBinderiPPKcjE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -8956,8 +8776,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP8AIBinderjPK7AParcelPS1_E",
    "name" : "int (*)(AIBinder *, unsigned int, const AParcel *, AParcel *)",
-   "referenced_type" : "type-547",
-   "self_type" : "type-546",
+   "referenced_type" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
+   "self_type" : "_ZTIPFiP8AIBinderjPK7AParcelPS1_E",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -8965,8 +8785,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiPK7AParcelPvjE",
    "name" : "int (*)(const AParcel *, void *, unsigned int)",
-   "referenced_type" : "type-596",
-   "self_type" : "type-600",
+   "referenced_type" : "_ZTIFiPK7AParcelPvjE",
+   "self_type" : "_ZTIPFiPK7AParcelPvjE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8974,8 +8794,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "short (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-268",
-   "self_type" : "type-267",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8983,8 +8803,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "name" : "short (*)(_JNIEnv *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-266",
-   "self_type" : "type-265",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8992,8 +8812,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "short (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-264",
-   "self_type" : "type-263",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9001,8 +8821,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "short (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9010,8 +8830,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-116",
-   "self_type" : "type-115",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9019,8 +8839,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jmethodID *, char *)",
-   "referenced_type" : "type-114",
-   "self_type" : "type-113",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9028,8 +8848,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-112",
-   "self_type" : "type-111",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9037,8 +8857,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-176",
-   "self_type" : "type-175",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9046,8 +8866,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-174",
-   "self_type" : "type-173",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9055,8 +8875,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-172",
-   "self_type" : "type-171",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9064,8 +8884,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-218",
-   "self_type" : "type-217",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9073,8 +8893,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "unsigned short (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-262",
-   "self_type" : "type-261",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9082,8 +8902,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "name" : "unsigned short (*)(_JNIEnv *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-260",
-   "self_type" : "type-259",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9091,8 +8911,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "unsigned short (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-258",
-   "self_type" : "type-257",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9100,8 +8920,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "unsigned short (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-306",
-   "self_type" : "type-305",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9109,8 +8929,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-110",
-   "self_type" : "type-109",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9118,8 +8938,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jmethodID *, char *)",
-   "referenced_type" : "type-108",
-   "self_type" : "type-107",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9127,8 +8947,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-106",
-   "self_type" : "type-105",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9136,8 +8956,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-170",
-   "self_type" : "type-169",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9145,8 +8965,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-168",
-   "self_type" : "type-167",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9154,8 +8974,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-166",
-   "self_type" : "type-165",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9163,8 +8983,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-216",
-   "self_type" : "type-215",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9172,8 +8992,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvE",
    "name" : "void (*)(_JNIEnv *)",
-   "referenced_type" : "type-55",
-   "self_type" : "type-54",
+   "referenced_type" : "_ZTIFvP7_JNIEnvE",
+   "self_type" : "_ZTIPFvP7_JNIEnvE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9181,8 +9001,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP10_jintArrayPiiE",
    "name" : "void (*)(_JNIEnv *, _jintArray *, int *, int)",
-   "referenced_type" : "type-430",
-   "self_type" : "type-429",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayPiiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayPiiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9190,8 +9010,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPKiE",
    "name" : "void (*)(_JNIEnv *, _jintArray *, int, int, const int *)",
-   "referenced_type" : "type-466",
-   "self_type" : "type-465",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPKiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPKiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9199,8 +9019,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPiE",
    "name" : "void (*)(_JNIEnv *, _jintArray *, int, int, int *)",
-   "referenced_type" : "type-446",
-   "self_type" : "type-445",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9208,8 +9028,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayPaiE",
    "name" : "void (*)(_JNIEnv *, _jbyteArray *, signed char *, int)",
-   "referenced_type" : "type-424",
-   "self_type" : "type-423",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayPaiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayPaiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9217,8 +9037,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPKaE",
    "name" : "void (*)(_JNIEnv *, _jbyteArray *, int, int, const signed char *)",
-   "referenced_type" : "type-458",
-   "self_type" : "type-457",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPKaE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPKaE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9226,8 +9046,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPaE",
    "name" : "void (*)(_JNIEnv *, _jbyteArray *, int, int, signed char *)",
-   "referenced_type" : "type-440",
-   "self_type" : "type-439",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPaE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPaE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9235,8 +9055,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jcharArrayPtiE",
    "name" : "void (*)(_JNIEnv *, _jcharArray *, unsigned short *, int)",
-   "referenced_type" : "type-426",
-   "self_type" : "type-425",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayPtiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayPtiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9244,8 +9064,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPKtE",
    "name" : "void (*)(_JNIEnv *, _jcharArray *, int, int, const unsigned short *)",
-   "referenced_type" : "type-460",
-   "self_type" : "type-459",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPKtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPKtE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9253,8 +9073,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPtE",
    "name" : "void (*)(_JNIEnv *, _jcharArray *, int, int, unsigned short *)",
-   "referenced_type" : "type-442",
-   "self_type" : "type-441",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPtE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9262,8 +9082,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jlongArrayPxiE",
    "name" : "void (*)(_JNIEnv *, _jlongArray *, long long *, int)",
-   "referenced_type" : "type-432",
-   "self_type" : "type-431",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayPxiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayPxiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9271,8 +9091,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPKxE",
    "name" : "void (*)(_JNIEnv *, _jlongArray *, int, int, const long long *)",
-   "referenced_type" : "type-470",
-   "self_type" : "type-469",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPKxE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPKxE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9280,8 +9100,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPxE",
    "name" : "void (*)(_JNIEnv *, _jlongArray *, int, int, long long *)",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPxE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPxE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9289,8 +9109,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayPfiE",
    "name" : "void (*)(_JNIEnv *, _jfloatArray *, float *, int)",
-   "referenced_type" : "type-434",
-   "self_type" : "type-433",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayPfiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayPfiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9298,8 +9118,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPKfE",
    "name" : "void (*)(_JNIEnv *, _jfloatArray *, int, int, const float *)",
-   "referenced_type" : "type-474",
-   "self_type" : "type-473",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPKfE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPKfE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9307,8 +9127,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPfE",
    "name" : "void (*)(_JNIEnv *, _jfloatArray *, int, int, float *)",
-   "referenced_type" : "type-450",
-   "self_type" : "type-449",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPfE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPfE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9316,8 +9136,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jshortArrayPsiE",
    "name" : "void (*)(_JNIEnv *, _jshortArray *, short *, int)",
-   "referenced_type" : "type-428",
-   "self_type" : "type-427",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayPsiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayPsiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9325,8 +9145,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPKsE",
    "name" : "void (*)(_JNIEnv *, _jshortArray *, int, int, const short *)",
-   "referenced_type" : "type-462",
-   "self_type" : "type-461",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPKsE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPKsE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9334,8 +9154,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPsE",
    "name" : "void (*)(_JNIEnv *, _jshortArray *, int, int, short *)",
-   "referenced_type" : "type-444",
-   "self_type" : "type-443",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPsE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPsE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9343,8 +9163,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayPdiE",
    "name" : "void (*)(_JNIEnv *, _jdoubleArray *, double *, int)",
-   "referenced_type" : "type-436",
-   "self_type" : "type-435",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayPdiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayPdiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9352,8 +9172,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
    "name" : "void (*)(_JNIEnv *, _jdoubleArray *, int, int, const double *)",
-   "referenced_type" : "type-478",
-   "self_type" : "type-477",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9361,8 +9181,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPdE",
    "name" : "void (*)(_JNIEnv *, _jdoubleArray *, int, int, double *)",
-   "referenced_type" : "type-452",
-   "self_type" : "type-451",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPdE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPdE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9370,8 +9190,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
    "name" : "void (*)(_JNIEnv *, _jobjectArray *, int, _jobject *)",
-   "referenced_type" : "type-365",
-   "self_type" : "type-364",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9379,8 +9199,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayPhiE",
    "name" : "void (*)(_JNIEnv *, _jbooleanArray *, unsigned char *, int)",
-   "referenced_type" : "type-422",
-   "self_type" : "type-421",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayPhiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayPhiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9388,8 +9208,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
    "name" : "void (*)(_JNIEnv *, _jbooleanArray *, int, int, const unsigned char *)",
-   "referenced_type" : "type-454",
-   "self_type" : "type-453",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9397,8 +9217,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPhE",
    "name" : "void (*)(_JNIEnv *, _jbooleanArray *, int, int, unsigned char *)",
-   "referenced_type" : "type-438",
-   "self_type" : "type-437",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPhE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9406,8 +9226,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jarrayPviE",
    "name" : "void (*)(_JNIEnv *, _jarray *, void *, int)",
-   "referenced_type" : "type-513",
-   "self_type" : "type-512",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jarrayPviE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jarrayPviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9415,8 +9235,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-298",
-   "self_type" : "type-297",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9424,8 +9244,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-296",
-   "self_type" : "type-295",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9433,8 +9253,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-294",
-   "self_type" : "type-293",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9442,8 +9262,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, _jobject *)",
-   "referenced_type" : "type-318",
-   "self_type" : "type-317",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9451,8 +9271,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, signed char)",
-   "referenced_type" : "type-322",
-   "self_type" : "type-321",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9460,8 +9280,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, double)",
-   "referenced_type" : "type-334",
-   "self_type" : "type-333",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9469,8 +9289,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, float)",
-   "referenced_type" : "type-332",
-   "self_type" : "type-331",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9478,8 +9298,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, unsigned char)",
-   "referenced_type" : "type-320",
-   "self_type" : "type-319",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9487,8 +9307,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, int)",
-   "referenced_type" : "type-328",
-   "self_type" : "type-327",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9496,8 +9316,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, short)",
-   "referenced_type" : "type-326",
-   "self_type" : "type-325",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9505,8 +9325,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, unsigned short)",
-   "referenced_type" : "type-324",
-   "self_type" : "type-323",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9514,8 +9334,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDxE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, long long)",
-   "referenced_type" : "type-330",
-   "self_type" : "type-329",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDxE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDxE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9523,8 +9343,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectE",
    "name" : "void (*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9532,8 +9352,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-146",
-   "self_type" : "type-145",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9541,8 +9361,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jmethodID *, char *)",
-   "referenced_type" : "type-144",
-   "self_type" : "type-143",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9550,8 +9370,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-142",
-   "self_type" : "type-141",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9559,8 +9379,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-206",
-   "self_type" : "type-205",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9568,8 +9388,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-204",
-   "self_type" : "type-203",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9577,8 +9397,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-202",
-   "self_type" : "type-201",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9586,8 +9406,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, _jobject *)",
-   "referenced_type" : "type-228",
-   "self_type" : "type-227",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9595,8 +9415,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, signed char)",
-   "referenced_type" : "type-232",
-   "self_type" : "type-231",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9604,8 +9424,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, double)",
-   "referenced_type" : "type-244",
-   "self_type" : "type-243",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9613,8 +9433,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, float)",
-   "referenced_type" : "type-242",
-   "self_type" : "type-241",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9622,8 +9442,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, unsigned char)",
-   "referenced_type" : "type-230",
-   "self_type" : "type-229",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9631,8 +9451,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, int)",
-   "referenced_type" : "type-238",
-   "self_type" : "type-237",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9640,8 +9460,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, short)",
-   "referenced_type" : "type-236",
-   "self_type" : "type-235",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9649,8 +9469,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, unsigned short)",
-   "referenced_type" : "type-234",
-   "self_type" : "type-233",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9658,8 +9478,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDxE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, long long)",
-   "referenced_type" : "type-240",
-   "self_type" : "type-239",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDxE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDxE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9667,8 +9487,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jstringPKcE",
    "name" : "void (*)(_JNIEnv *, _jstring *, const char *)",
-   "referenced_type" : "type-353",
-   "self_type" : "type-352",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringPKcE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9676,8 +9496,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jstringPKtE",
    "name" : "void (*)(_JNIEnv *, _jstring *, const unsigned short *)",
-   "referenced_type" : "type-347",
-   "self_type" : "type-346",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringPKtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKtE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9685,8 +9505,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jstringiiPcE",
    "name" : "void (*)(_JNIEnv *, _jstring *, int, int, char *)",
-   "referenced_type" : "type-509",
-   "self_type" : "type-508",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPcE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jstringiiPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9694,8 +9514,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jstringiiPtE",
    "name" : "void (*)(_JNIEnv *, _jstring *, int, int, unsigned short *)",
-   "referenced_type" : "type-507",
-   "self_type" : "type-506",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jstringiiPtE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9703,8 +9523,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvPKcE",
    "name" : "void (*)(_JNIEnv *, const char *)",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "_ZTIFvP7_JNIEnvPKcE",
+   "self_type" : "_ZTIPFvP7_JNIEnvPKcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9712,8 +9532,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvPvE",
    "name" : "void (*)(void *)",
-   "referenced_type" : "type-559",
-   "self_type" : "type-605",
+   "referenced_type" : "_ZTIFvPvE",
+   "self_type" : "_ZTIPFvPvE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9721,8 +9541,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvPvjbE",
    "name" : "void (*)(void *, unsigned int, bool)",
-   "referenced_type" : "type-636",
-   "self_type" : "type-637",
+   "referenced_type" : "_ZTIFvPvjbE",
+   "self_type" : "_ZTIPFvPvjbE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -9730,8 +9550,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "long long (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-280",
-   "self_type" : "type-279",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9739,8 +9559,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "name" : "long long (*)(_JNIEnv *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-278",
-   "self_type" : "type-277",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9748,8 +9568,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "long long (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-276",
-   "self_type" : "type-275",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9757,8 +9577,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "long long (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-312",
-   "self_type" : "type-311",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9766,8 +9586,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectE",
    "name" : "long long (*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-521",
-   "self_type" : "type-520",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9775,8 +9595,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "long long (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-128",
-   "self_type" : "type-127",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9784,8 +9604,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "name" : "long long (*)(_JNIEnv *, _jobject *, _jmethodID *, char *)",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9793,8 +9613,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "long long (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-124",
-   "self_type" : "type-123",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9802,8 +9622,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "long long (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-188",
-   "self_type" : "type-187",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9811,8 +9631,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "name" : "long long (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-186",
-   "self_type" : "type-185",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9820,8 +9640,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "long long (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-184",
-   "self_type" : "type-183",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9829,8 +9649,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "long long (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-222",
-   "self_type" : "type-221",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9838,8 +9658,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK14AIBinder_Class",
    "name" : "const AIBinder_Class *",
-   "referenced_type" : "type-553",
-   "self_type" : "type-555",
+   "referenced_type" : "_ZTIK14AIBinder_Class",
+   "self_type" : "_ZTIPK14AIBinder_Class",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9847,8 +9667,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK14AIBinder_Class",
    "name" : "const AIBinder_Class *",
-   "referenced_type" : "type-663",
-   "self_type" : "type-665",
+   "referenced_type" : "_ZTIK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9856,8 +9676,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK15JNINativeMethod",
    "name" : "const JNINativeMethod *",
-   "referenced_type" : "type-484",
-   "self_type" : "type-483",
+   "referenced_type" : "_ZTIK15JNINativeMethod",
+   "self_type" : "_ZTIPK15JNINativeMethod",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9865,8 +9685,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK18JNIInvokeInterface",
    "name" : "const JNIInvokeInterface *",
-   "referenced_type" : "type-496",
-   "self_type" : "type-495",
+   "referenced_type" : "_ZTIK18JNIInvokeInterface",
+   "self_type" : "_ZTIPK18JNIInvokeInterface",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9874,8 +9694,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK18JNINativeInterface",
    "name" : "const JNINativeInterface *",
-   "referenced_type" : "type-10",
-   "self_type" : "type-9",
+   "referenced_type" : "_ZTIK18JNINativeInterface",
+   "self_type" : "_ZTIPK18JNINativeInterface",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9883,8 +9703,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK6jvalue",
    "name" : "const jvalue *",
-   "referenced_type" : "type-74",
-   "self_type" : "type-73",
+   "referenced_type" : "_ZTIK6jvalue",
+   "self_type" : "_ZTIPK6jvalue",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9892,17 +9712,17 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AParcel",
    "name" : "const AParcel *",
-   "referenced_type" : "type-527",
-   "self_type" : "type-526",
+   "referenced_type" : "_ZTIK7AParcel",
+   "self_type" : "_ZTIPK7AParcel",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AParcel",
    "name" : "const AParcel *",
-   "referenced_type" : "type-542",
-   "self_type" : "type-541",
+   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9910,35 +9730,26 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AParcel",
    "name" : "const AParcel *",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
+   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
+   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "type-658",
-   "self_type" : "type-660",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AStatus",
    "name" : "const AStatus *",
-   "referenced_type" : "type-536",
-   "self_type" : "type-538",
+   "referenced_type" : "_ZTIK7AStatus",
+   "self_type" : "_ZTIPK7AStatus",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AStatus",
    "name" : "const AStatus *",
-   "referenced_type" : "type-575",
-   "self_type" : "type-577",
+   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
+   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -9946,26 +9757,17 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AStatus",
    "name" : "const AStatus *",
-   "referenced_type" : "type-649",
-   "self_type" : "type-651",
+   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AStatus",
-   "name" : "const AStatus *",
-   "referenced_type" : "type-681",
-   "self_type" : "type-683",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK8AIBinder",
    "name" : "const AIBinder *",
-   "referenced_type" : "type-557",
-   "self_type" : "type-560",
+   "referenced_type" : "_ZTIK8AIBinder",
+   "self_type" : "_ZTIPK8AIBinder",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9973,8 +9775,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK8AIBinder",
    "name" : "const AIBinder *",
-   "referenced_type" : "type-666",
-   "self_type" : "type-668",
+   "referenced_type" : "_ZTIK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9982,8 +9784,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKDs",
    "name" : "const char16_t *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-615",
+   "referenced_type" : "_ZTIKDs",
+   "self_type" : "_ZTIPKDs",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -9991,8 +9793,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKa",
    "name" : "const signed char *",
-   "referenced_type" : "type-25",
-   "self_type" : "type-24",
+   "referenced_type" : "_ZTIKa",
+   "self_type" : "_ZTIPKa",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10000,8 +9802,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKc",
    "name" : "const char *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
+   "referenced_type" : "_ZTIKc",
+   "self_type" : "_ZTIPKc",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10009,8 +9811,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKd",
    "name" : "const double *",
-   "referenced_type" : "type-480",
-   "self_type" : "type-479",
+   "referenced_type" : "_ZTIKd",
+   "self_type" : "_ZTIPKd",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10018,8 +9820,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKf",
    "name" : "const float *",
-   "referenced_type" : "type-476",
-   "self_type" : "type-475",
+   "referenced_type" : "_ZTIKf",
+   "self_type" : "_ZTIPKf",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10027,8 +9829,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKh",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-456",
-   "self_type" : "type-455",
+   "referenced_type" : "_ZTIKh",
+   "self_type" : "_ZTIPKh",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10036,8 +9838,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKi",
    "name" : "const int *",
-   "referenced_type" : "type-468",
-   "self_type" : "type-467",
+   "referenced_type" : "_ZTIKi",
+   "self_type" : "_ZTIPKi",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10045,8 +9847,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKj",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-608",
-   "self_type" : "type-609",
+   "referenced_type" : "_ZTIKj",
+   "self_type" : "_ZTIPKj",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10054,8 +9856,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKs",
    "name" : "const short *",
-   "referenced_type" : "type-464",
-   "self_type" : "type-463",
+   "referenced_type" : "_ZTIKs",
+   "self_type" : "_ZTIPKs",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10063,8 +9865,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKt",
    "name" : "const unsigned short *",
-   "referenced_type" : "type-340",
-   "self_type" : "type-339",
+   "referenced_type" : "_ZTIKt",
+   "self_type" : "_ZTIPKt",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10072,8 +9874,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKv",
    "name" : "const void *",
-   "referenced_type" : "type-584",
-   "self_type" : "type-585",
+   "referenced_type" : "_ZTIKv",
+   "self_type" : "_ZTIPKv",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10081,8 +9883,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKx",
    "name" : "const long long *",
-   "referenced_type" : "type-472",
-   "self_type" : "type-471",
+   "referenced_type" : "_ZTIKx",
+   "self_type" : "_ZTIPKx",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10090,8 +9892,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKy",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-610",
-   "self_type" : "type-611",
+   "referenced_type" : "_ZTIKy",
+   "self_type" : "_ZTIPKy",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10099,8 +9901,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP7AParcel",
    "name" : "AParcel **",
-   "referenced_type" : "type-544",
-   "self_type" : "type-563",
+   "referenced_type" : "_ZTIP7AParcel",
+   "self_type" : "_ZTIPP7AParcel",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10108,8 +9910,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP7AParcel",
    "name" : "AParcel **",
-   "referenced_type" : "type-661",
-   "self_type" : "type-671",
+   "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10117,8 +9919,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP7AStatus",
    "name" : "AStatus **",
-   "referenced_type" : "type-578",
-   "self_type" : "type-580",
+   "referenced_type" : "_ZTIP7AStatus",
+   "self_type" : "_ZTIPP7AStatus",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10126,8 +9928,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP7AStatus",
    "name" : "AStatus **",
-   "referenced_type" : "type-684",
-   "self_type" : "type-686",
+   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
+   "self_type" : "_ZTIPP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10135,8 +9937,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP7_JNIEnv",
    "name" : "_JNIEnv **",
-   "referenced_type" : "type-7",
-   "self_type" : "type-502",
+   "referenced_type" : "_ZTIP7_JNIEnv",
+   "self_type" : "_ZTIPP7_JNIEnv",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10144,8 +9946,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP7_JavaVM",
    "name" : "_JavaVM **",
-   "referenced_type" : "type-493",
-   "self_type" : "type-492",
+   "referenced_type" : "_ZTIP7_JavaVM",
+   "self_type" : "_ZTIPP7_JavaVM",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10153,17 +9955,17 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP8AIBinder",
    "name" : "AIBinder **",
-   "referenced_type" : "type-529",
-   "self_type" : "type-531",
+   "referenced_type" : "_ZTIP8AIBinder",
+   "self_type" : "_ZTIPP8AIBinder",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP8AIBinder",
    "name" : "AIBinder **",
-   "referenced_type" : "type-548",
-   "self_type" : "type-566",
+   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10171,26 +9973,17 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP8AIBinder",
    "name" : "AIBinder **",
-   "referenced_type" : "type-627",
-   "self_type" : "type-638",
+   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
+   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "type-656",
-   "self_type" : "type-674",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPDs",
    "name" : "char16_t **",
-   "referenced_type" : "type-607",
-   "self_type" : "type-640",
+   "referenced_type" : "_ZTIPDs",
+   "self_type" : "_ZTIPPDs",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10198,8 +9991,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPKc",
    "name" : "const char **",
-   "referenced_type" : "type-21",
-   "self_type" : "type-551",
+   "referenced_type" : "_ZTIPKc",
+   "self_type" : "_ZTIPPKc",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10207,8 +10000,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPa",
    "name" : "signed char **",
-   "referenced_type" : "type-402",
-   "self_type" : "type-643",
+   "referenced_type" : "_ZTIPa",
+   "self_type" : "_ZTIPPa",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10216,8 +10009,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPc",
    "name" : "char **",
-   "referenced_type" : "type-70",
-   "self_type" : "type-582",
+   "referenced_type" : "_ZTIPc",
+   "self_type" : "_ZTIPPc",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10225,8 +10018,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPd",
    "name" : "double **",
-   "referenced_type" : "type-420",
-   "self_type" : "type-634",
+   "referenced_type" : "_ZTIPd",
+   "self_type" : "_ZTIPPd",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10234,8 +10027,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPf",
    "name" : "float **",
-   "referenced_type" : "type-417",
-   "self_type" : "type-631",
+   "referenced_type" : "_ZTIPf",
+   "self_type" : "_ZTIPPf",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10243,8 +10036,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPi",
    "name" : "int **",
-   "referenced_type" : "type-411",
-   "self_type" : "type-617",
+   "referenced_type" : "_ZTIPi",
+   "self_type" : "_ZTIPPi",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10252,8 +10045,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPj",
    "name" : "unsigned int **",
-   "referenced_type" : "type-603",
-   "self_type" : "type-620",
+   "referenced_type" : "_ZTIPj",
+   "self_type" : "_ZTIPPj",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10261,8 +10054,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPv",
    "name" : "void **",
-   "referenced_type" : "type-12",
-   "self_type" : "type-505",
+   "referenced_type" : "_ZTIPv",
+   "self_type" : "_ZTIPPv",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10270,8 +10063,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPx",
    "name" : "long long **",
-   "referenced_type" : "type-414",
-   "self_type" : "type-623",
+   "referenced_type" : "_ZTIPx",
+   "self_type" : "_ZTIPPx",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10279,8 +10072,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPy",
    "name" : "unsigned long long **",
-   "referenced_type" : "type-604",
-   "self_type" : "type-626",
+   "referenced_type" : "_ZTIPy",
+   "self_type" : "_ZTIPPy",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10288,8 +10081,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPa",
    "name" : "signed char *",
-   "referenced_type" : "type-26",
-   "self_type" : "type-402",
+   "referenced_type" : "_ZTIa",
+   "self_type" : "_ZTIPa",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10297,8 +10090,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPb",
    "name" : "bool *",
-   "referenced_type" : "type-556",
-   "self_type" : "type-606",
+   "referenced_type" : "_ZTIb",
+   "self_type" : "_ZTIPb",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10306,8 +10099,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPc",
    "name" : "char *",
-   "referenced_type" : "type-23",
-   "self_type" : "type-70",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIPc",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10315,8 +10108,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPd",
    "name" : "double *",
-   "referenced_type" : "type-80",
-   "self_type" : "type-420",
+   "referenced_type" : "_ZTId",
+   "self_type" : "_ZTIPd",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10324,8 +10117,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPf",
    "name" : "float *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-417",
+   "referenced_type" : "_ZTIf",
+   "self_type" : "_ZTIPf",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10333,8 +10126,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPh",
    "name" : "unsigned char *",
-   "referenced_type" : "type-39",
-   "self_type" : "type-345",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIPh",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10342,8 +10135,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPi",
    "name" : "int *",
-   "referenced_type" : "type-16",
-   "self_type" : "type-411",
+   "referenced_type" : "_ZTIi",
+   "self_type" : "_ZTIPi",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10351,8 +10144,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPj",
    "name" : "unsigned int *",
-   "referenced_type" : "type-525",
-   "self_type" : "type-603",
+   "referenced_type" : "_ZTIj",
+   "self_type" : "_ZTIPj",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10360,8 +10153,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPs",
    "name" : "short *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-408",
+   "referenced_type" : "_ZTIs",
+   "self_type" : "_ZTIPs",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10369,8 +10162,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPt",
    "name" : "unsigned short *",
-   "referenced_type" : "type-76",
-   "self_type" : "type-405",
+   "referenced_type" : "_ZTIt",
+   "self_type" : "_ZTIPt",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10378,8 +10171,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPv",
    "name" : "void *",
-   "referenced_type" : "type-13",
-   "self_type" : "type-12",
+   "referenced_type" : "_ZTIv",
+   "self_type" : "_ZTIPv",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10387,8 +10180,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPx",
    "name" : "long long *",
-   "referenced_type" : "type-78",
-   "self_type" : "type-414",
+   "referenced_type" : "_ZTIx",
+   "self_type" : "_ZTIPx",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10396,8 +10189,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPy",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-601",
-   "self_type" : "type-604",
+   "referenced_type" : "_ZTIy",
+   "self_type" : "_ZTIPy",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   }
@@ -10409,18 +10202,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK14AIBinder_Class",
    "name" : "const AIBinder_Class",
-   "referenced_type" : "type-554",
-   "self_type" : "type-553",
-   "size" : 20,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK14AIBinder_Class",
-   "name" : "const AIBinder_Class",
-   "referenced_type" : "type-664",
-   "self_type" : "type-663",
+   "referenced_type" : "_ZTI14AIBinder_Class",
+   "self_type" : "_ZTIK14AIBinder_Class",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10429,8 +10212,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK15JNINativeMethod",
    "name" : "const JNINativeMethod",
-   "referenced_type" : "type-485",
-   "self_type" : "type-484",
+   "referenced_type" : "_ZTI15JNINativeMethod",
+   "self_type" : "_ZTIK15JNINativeMethod",
    "size" : 12,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10439,8 +10222,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK18JNIInvokeInterface",
    "name" : "const JNIInvokeInterface",
-   "referenced_type" : "type-497",
-   "self_type" : "type-496",
+   "referenced_type" : "_ZTI18JNIInvokeInterface",
+   "self_type" : "_ZTIK18JNIInvokeInterface",
    "size" : 32,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10449,8 +10232,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK18JNINativeInterface",
    "name" : "const JNINativeInterface",
-   "referenced_type" : "type-11",
-   "self_type" : "type-10",
+   "referenced_type" : "_ZTI18JNINativeInterface",
+   "self_type" : "_ZTIK18JNINativeInterface",
    "size" : 932,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10459,8 +10242,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK6jvalue",
    "name" : "const jvalue",
-   "referenced_type" : "type-75",
-   "self_type" : "type-74",
+   "referenced_type" : "_ZTI6jvalue",
+   "self_type" : "_ZTIK6jvalue",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10469,38 +10252,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK7AParcel",
    "name" : "const AParcel",
-   "referenced_type" : "type-528",
-   "self_type" : "type-527",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AParcel",
-   "name" : "const AParcel",
-   "referenced_type" : "type-543",
-   "self_type" : "type-542",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AParcel",
-   "name" : "const AParcel",
-   "referenced_type" : "type-599",
-   "self_type" : "type-598",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AParcel",
-   "name" : "const AParcel",
-   "referenced_type" : "type-659",
-   "self_type" : "type-658",
+   "referenced_type" : "_ZTI7AParcel",
+   "self_type" : "_ZTIK7AParcel",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10509,38 +10262,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK7AStatus",
    "name" : "const AStatus",
-   "referenced_type" : "type-537",
-   "self_type" : "type-536",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AStatus",
-   "name" : "const AStatus",
-   "referenced_type" : "type-576",
-   "self_type" : "type-575",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AStatus",
-   "name" : "const AStatus",
-   "referenced_type" : "type-650",
-   "self_type" : "type-649",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AStatus",
-   "name" : "const AStatus",
-   "referenced_type" : "type-682",
-   "self_type" : "type-681",
+   "referenced_type" : "_ZTI7AStatus",
+   "self_type" : "_ZTIK7AStatus",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10549,18 +10272,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK8AIBinder",
    "name" : "const AIBinder",
-   "referenced_type" : "type-558",
-   "self_type" : "type-557",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK8AIBinder",
-   "name" : "const AIBinder",
-   "referenced_type" : "type-667",
-   "self_type" : "type-666",
+   "referenced_type" : "_ZTI8AIBinder",
+   "self_type" : "_ZTIK8AIBinder",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10569,8 +10282,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKDs",
    "name" : "const char16_t",
-   "referenced_type" : "type-602",
-   "self_type" : "type-614",
+   "referenced_type" : "_ZTIDs",
+   "self_type" : "_ZTIKDs",
    "size" : 2,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10579,8 +10292,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKa",
    "name" : "const signed char",
-   "referenced_type" : "type-26",
-   "self_type" : "type-25",
+   "referenced_type" : "_ZTIa",
+   "self_type" : "_ZTIKa",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10589,8 +10302,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKc",
    "name" : "const char",
-   "referenced_type" : "type-23",
-   "self_type" : "type-22",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIKc",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10599,8 +10312,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKd",
    "name" : "const double",
-   "referenced_type" : "type-80",
-   "self_type" : "type-480",
+   "referenced_type" : "_ZTId",
+   "self_type" : "_ZTIKd",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10609,8 +10322,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKf",
    "name" : "const float",
-   "referenced_type" : "type-79",
-   "self_type" : "type-476",
+   "referenced_type" : "_ZTIf",
+   "self_type" : "_ZTIKf",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10619,8 +10332,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKh",
    "name" : "const unsigned char",
-   "referenced_type" : "type-39",
-   "self_type" : "type-456",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIKh",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10629,8 +10342,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKi",
    "name" : "const int",
-   "referenced_type" : "type-16",
-   "self_type" : "type-468",
+   "referenced_type" : "_ZTIi",
+   "self_type" : "_ZTIKi",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10639,8 +10352,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKj",
    "name" : "const unsigned int",
-   "referenced_type" : "type-525",
-   "self_type" : "type-608",
+   "referenced_type" : "_ZTIj",
+   "self_type" : "_ZTIKj",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10649,8 +10362,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKs",
    "name" : "const short",
-   "referenced_type" : "type-77",
-   "self_type" : "type-464",
+   "referenced_type" : "_ZTIs",
+   "self_type" : "_ZTIKs",
    "size" : 2,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10659,8 +10372,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKt",
    "name" : "const unsigned short",
-   "referenced_type" : "type-76",
-   "self_type" : "type-340",
+   "referenced_type" : "_ZTIt",
+   "self_type" : "_ZTIKt",
    "size" : 2,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10668,8 +10381,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKv",
    "name" : "const void",
-   "referenced_type" : "type-13",
-   "self_type" : "type-584",
+   "referenced_type" : "_ZTIv",
+   "self_type" : "_ZTIKv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -10677,8 +10390,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKx",
    "name" : "const long long",
-   "referenced_type" : "type-78",
-   "self_type" : "type-472",
+   "referenced_type" : "_ZTIx",
+   "self_type" : "_ZTIKx",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10687,8 +10400,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKy",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-601",
-   "self_type" : "type-610",
+   "referenced_type" : "_ZTIy",
+   "self_type" : "_ZTIKy",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   }
@@ -10700,14 +10413,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-357"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI10_jintArray",
    "name" : "_jintArray",
    "record_kind" : "class",
-   "referenced_type" : "type-385",
-   "self_type" : "type-385",
+   "referenced_type" : "_ZTI10_jintArray",
+   "self_type" : "_ZTI10_jintArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10716,14 +10429,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-357"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI11_jbyteArray",
    "name" : "_jbyteArray",
    "record_kind" : "class",
-   "referenced_type" : "type-373",
-   "self_type" : "type-373",
+   "referenced_type" : "_ZTI11_jbyteArray",
+   "self_type" : "_ZTI11_jbyteArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10732,14 +10445,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-357"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI11_jcharArray",
    "name" : "_jcharArray",
    "record_kind" : "class",
-   "referenced_type" : "type-377",
-   "self_type" : "type-377",
+   "referenced_type" : "_ZTI11_jcharArray",
+   "self_type" : "_ZTI11_jcharArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10748,14 +10461,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-357"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI11_jlongArray",
    "name" : "_jlongArray",
    "record_kind" : "class",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "_ZTI11_jlongArray",
+   "self_type" : "_ZTI11_jlongArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10764,14 +10477,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTI8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI11_jthrowable",
    "name" : "_jthrowable",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "_ZTI11_jthrowable",
+   "self_type" : "_ZTI11_jthrowable",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10781,18 +10494,18 @@
    [
     {
      "field_name" : "optionString",
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "field_name" : "extraInfo",
      "field_offset" : 32,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
    "linker_set_key" : "_ZTI12JavaVMOption",
    "name" : "JavaVMOption",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
+   "referenced_type" : "_ZTI12JavaVMOption",
+   "self_type" : "_ZTI12JavaVMOption",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10801,14 +10514,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-357"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI12_jfloatArray",
    "name" : "_jfloatArray",
    "record_kind" : "class",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
+   "referenced_type" : "_ZTI12_jfloatArray",
+   "self_type" : "_ZTI12_jfloatArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10817,14 +10530,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-357"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI12_jshortArray",
    "name" : "_jshortArray",
    "record_kind" : "class",
-   "referenced_type" : "type-381",
-   "self_type" : "type-381",
+   "referenced_type" : "_ZTI12_jshortArray",
+   "self_type" : "_ZTI12_jshortArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10833,14 +10546,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-357"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI13_jdoubleArray",
    "name" : "_jdoubleArray",
    "record_kind" : "class",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
+   "referenced_type" : "_ZTI13_jdoubleArray",
+   "self_type" : "_ZTI13_jdoubleArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10849,14 +10562,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-357"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI13_jobjectArray",
    "name" : "_jobjectArray",
    "record_kind" : "class",
-   "referenced_type" : "type-361",
-   "self_type" : "type-361",
+   "referenced_type" : "_ZTI13_jobjectArray",
+   "self_type" : "_ZTI13_jobjectArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10866,28 +10579,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "nOptions",
      "field_offset" : 32,
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "options",
      "field_offset" : 64,
-     "referenced_type" : "type-572"
+     "referenced_type" : "_ZTIP12JavaVMOption"
     },
     {
      "field_name" : "ignoreUnrecognized",
      "field_offset" : 96,
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     }
    ],
    "linker_set_key" : "_ZTI14JavaVMInitArgs",
    "name" : "JavaVMInitArgs",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
+   "referenced_type" : "_ZTI14JavaVMInitArgs",
+   "self_type" : "_ZTI14JavaVMInitArgs",
    "size" : 16,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10896,14 +10609,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-357"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI14_jbooleanArray",
    "name" : "_jbooleanArray",
    "record_kind" : "class",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "_ZTI14_jbooleanArray",
+   "self_type" : "_ZTI14_jbooleanArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10913,23 +10626,23 @@
    [
     {
      "field_name" : "name",
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "field_name" : "signature",
      "field_offset" : 32,
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "field_name" : "fnPtr",
      "field_offset" : 64,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
    "linker_set_key" : "_ZTI15JNINativeMethod",
    "name" : "JNINativeMethod",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
+   "referenced_type" : "_ZTI15JNINativeMethod",
+   "self_type" : "_ZTI15JNINativeMethod",
    "size" : 12,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10939,23 +10652,23 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "name",
      "field_offset" : 32,
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "field_name" : "group",
      "field_offset" : 64,
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI16JavaVMAttachArgs",
    "name" : "JavaVMAttachArgs",
-   "referenced_type" : "type-569",
-   "self_type" : "type-569",
+   "referenced_type" : "_ZTI16JavaVMAttachArgs",
+   "self_type" : "_ZTI16JavaVMAttachArgs",
    "size" : 12,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10965,48 +10678,48 @@
    [
     {
      "field_name" : "reserved0",
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved1",
      "field_offset" : 32,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved2",
      "field_offset" : 64,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "DestroyJavaVM",
      "field_offset" : 96,
-     "referenced_type" : "type-498"
+     "referenced_type" : "_ZTIPFiP7_JavaVME"
     },
     {
      "field_name" : "AttachCurrentThread",
      "field_offset" : 128,
-     "referenced_type" : "type-500"
+     "referenced_type" : "_ZTIPFiP7_JavaVMPP7_JNIEnvPvE"
     },
     {
      "field_name" : "DetachCurrentThread",
      "field_offset" : 160,
-     "referenced_type" : "type-498"
+     "referenced_type" : "_ZTIPFiP7_JavaVME"
     },
     {
      "field_name" : "GetEnv",
      "field_offset" : 192,
-     "referenced_type" : "type-503"
+     "referenced_type" : "_ZTIPFiP7_JavaVMPPviE"
     },
     {
      "field_name" : "AttachCurrentThreadAsDaemon",
      "field_offset" : 224,
-     "referenced_type" : "type-500"
+     "referenced_type" : "_ZTIPFiP7_JavaVMPP7_JNIEnvPvE"
     }
    ],
    "linker_set_key" : "_ZTI18JNIInvokeInterface",
    "name" : "JNIInvokeInterface",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "_ZTI18JNIInvokeInterface",
+   "self_type" : "_ZTI18JNIInvokeInterface",
    "size" : 32,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -11016,1173 +10729,1173 @@
    [
     {
      "field_name" : "reserved0",
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved1",
      "field_offset" : 32,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved2",
      "field_offset" : 64,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved3",
      "field_offset" : 96,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "GetVersion",
      "field_offset" : 128,
-     "referenced_type" : "type-14"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvE"
     },
     {
      "field_name" : "DefineClass",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "_ZTIPFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE"
     },
     {
      "field_name" : "FindClass",
      "field_offset" : 192,
-     "referenced_type" : "type-27"
+     "referenced_type" : "_ZTIPFP7_jclassP7_JNIEnvPKcE"
     },
     {
      "field_name" : "FromReflectedMethod",
      "field_offset" : 224,
-     "referenced_type" : "type-29"
+     "referenced_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "FromReflectedField",
      "field_offset" : 256,
-     "referenced_type" : "type-33"
+     "referenced_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "ToReflectedMethod",
      "field_offset" : 288,
-     "referenced_type" : "type-37"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE"
     },
     {
      "field_name" : "GetSuperclass",
      "field_offset" : 320,
-     "referenced_type" : "type-40"
+     "referenced_type" : "_ZTIPFP7_jclassP7_JNIEnvS0_E"
     },
     {
      "field_name" : "IsAssignableFrom",
      "field_offset" : 352,
-     "referenced_type" : "type-42"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassS2_E"
     },
     {
      "field_name" : "ToReflectedField",
      "field_offset" : 384,
-     "referenced_type" : "type-44"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE"
     },
     {
      "field_name" : "Throw",
      "field_offset" : 416,
-     "referenced_type" : "type-46"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP11_jthrowableE"
     },
     {
      "field_name" : "ThrowNew",
      "field_offset" : 448,
-     "referenced_type" : "type-50"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassPKcE"
     },
     {
      "field_name" : "ExceptionOccurred",
      "field_offset" : 480,
-     "referenced_type" : "type-52"
+     "referenced_type" : "_ZTIPFP11_jthrowableP7_JNIEnvE"
     },
     {
      "field_name" : "ExceptionDescribe",
      "field_offset" : 512,
-     "referenced_type" : "type-54"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvE"
     },
     {
      "field_name" : "ExceptionClear",
      "field_offset" : 544,
-     "referenced_type" : "type-54"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvE"
     },
     {
      "field_name" : "FatalError",
      "field_offset" : 576,
-     "referenced_type" : "type-56"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvPKcE"
     },
     {
      "field_name" : "PushLocalFrame",
      "field_offset" : 608,
-     "referenced_type" : "type-58"
+     "referenced_type" : "_ZTIPFiP7_JNIEnviE"
     },
     {
      "field_name" : "PopLocalFrame",
      "field_offset" : 640,
-     "referenced_type" : "type-60"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E"
     },
     {
      "field_name" : "NewGlobalRef",
      "field_offset" : 672,
-     "referenced_type" : "type-60"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E"
     },
     {
      "field_name" : "DeleteGlobalRef",
      "field_offset" : 704,
-     "referenced_type" : "type-62"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "DeleteLocalRef",
      "field_offset" : 736,
-     "referenced_type" : "type-62"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "IsSameObject",
      "field_offset" : 768,
-     "referenced_type" : "type-64"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectS2_E"
     },
     {
      "field_name" : "NewLocalRef",
      "field_offset" : 800,
-     "referenced_type" : "type-60"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E"
     },
     {
      "field_name" : "EnsureLocalCapacity",
      "field_offset" : 832,
-     "referenced_type" : "type-58"
+     "referenced_type" : "_ZTIPFiP7_JNIEnviE"
     },
     {
      "field_name" : "AllocObject",
      "field_offset" : 864,
-     "referenced_type" : "type-3"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassE"
     },
     {
      "field_name" : "NewObject",
      "field_offset" : 896,
-     "referenced_type" : "type-66"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "NewObjectV",
      "field_offset" : 928,
-     "referenced_type" : "type-68"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "NewObjectA",
      "field_offset" : 960,
-     "referenced_type" : "type-71"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "GetObjectClass",
      "field_offset" : 992,
-     "referenced_type" : "type-81"
+     "referenced_type" : "_ZTIPFP7_jclassP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "IsInstanceOf",
      "field_offset" : 1024,
-     "referenced_type" : "type-83"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassE"
     },
     {
      "field_name" : "GetMethodID",
      "field_offset" : 1056,
-     "referenced_type" : "type-85"
+     "referenced_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E"
     },
     {
      "field_name" : "CallObjectMethod",
      "field_offset" : 1088,
-     "referenced_type" : "type-87"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE"
     },
     {
      "field_name" : "CallObjectMethodV",
      "field_offset" : 1120,
-     "referenced_type" : "type-89"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPcE"
     },
     {
      "field_name" : "CallObjectMethodA",
      "field_offset" : 1152,
-     "referenced_type" : "type-91"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallBooleanMethod",
      "field_offset" : 1184,
-     "referenced_type" : "type-93"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallBooleanMethodV",
      "field_offset" : 1216,
-     "referenced_type" : "type-95"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallBooleanMethodA",
      "field_offset" : 1248,
-     "referenced_type" : "type-97"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallByteMethod",
      "field_offset" : 1280,
-     "referenced_type" : "type-99"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallByteMethodV",
      "field_offset" : 1312,
-     "referenced_type" : "type-101"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallByteMethodA",
      "field_offset" : 1344,
-     "referenced_type" : "type-103"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallCharMethod",
      "field_offset" : 1376,
-     "referenced_type" : "type-105"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallCharMethodV",
      "field_offset" : 1408,
-     "referenced_type" : "type-107"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallCharMethodA",
      "field_offset" : 1440,
-     "referenced_type" : "type-109"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallShortMethod",
      "field_offset" : 1472,
-     "referenced_type" : "type-111"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallShortMethodV",
      "field_offset" : 1504,
-     "referenced_type" : "type-113"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallShortMethodA",
      "field_offset" : 1536,
-     "referenced_type" : "type-115"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallIntMethod",
      "field_offset" : 1568,
-     "referenced_type" : "type-117"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallIntMethodV",
      "field_offset" : 1600,
-     "referenced_type" : "type-119"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallIntMethodA",
      "field_offset" : 1632,
-     "referenced_type" : "type-121"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallLongMethod",
      "field_offset" : 1664,
-     "referenced_type" : "type-123"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallLongMethodV",
      "field_offset" : 1696,
-     "referenced_type" : "type-125"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallLongMethodA",
      "field_offset" : 1728,
-     "referenced_type" : "type-127"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallFloatMethod",
      "field_offset" : 1760,
-     "referenced_type" : "type-129"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallFloatMethodV",
      "field_offset" : 1792,
-     "referenced_type" : "type-131"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallFloatMethodA",
      "field_offset" : 1824,
-     "referenced_type" : "type-133"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallDoubleMethod",
      "field_offset" : 1856,
-     "referenced_type" : "type-135"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallDoubleMethodV",
      "field_offset" : 1888,
-     "referenced_type" : "type-137"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallDoubleMethodA",
      "field_offset" : 1920,
-     "referenced_type" : "type-139"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallVoidMethod",
      "field_offset" : 1952,
-     "referenced_type" : "type-141"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallVoidMethodV",
      "field_offset" : 1984,
-     "referenced_type" : "type-143"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallVoidMethodA",
      "field_offset" : 2016,
-     "referenced_type" : "type-145"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualObjectMethod",
      "field_offset" : 2048,
-     "referenced_type" : "type-147"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualObjectMethodV",
      "field_offset" : 2080,
-     "referenced_type" : "type-149"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallNonvirtualObjectMethodA",
      "field_offset" : 2112,
-     "referenced_type" : "type-151"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualBooleanMethod",
      "field_offset" : 2144,
-     "referenced_type" : "type-153"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualBooleanMethodV",
      "field_offset" : 2176,
-     "referenced_type" : "type-155"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallNonvirtualBooleanMethodA",
      "field_offset" : 2208,
-     "referenced_type" : "type-157"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualByteMethod",
      "field_offset" : 2240,
-     "referenced_type" : "type-159"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualByteMethodV",
      "field_offset" : 2272,
-     "referenced_type" : "type-161"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallNonvirtualByteMethodA",
      "field_offset" : 2304,
-     "referenced_type" : "type-163"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualCharMethod",
      "field_offset" : 2336,
-     "referenced_type" : "type-165"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualCharMethodV",
      "field_offset" : 2368,
-     "referenced_type" : "type-167"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallNonvirtualCharMethodA",
      "field_offset" : 2400,
-     "referenced_type" : "type-169"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualShortMethod",
      "field_offset" : 2432,
-     "referenced_type" : "type-171"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualShortMethodV",
      "field_offset" : 2464,
-     "referenced_type" : "type-173"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallNonvirtualShortMethodA",
      "field_offset" : 2496,
-     "referenced_type" : "type-175"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualIntMethod",
      "field_offset" : 2528,
-     "referenced_type" : "type-177"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualIntMethodV",
      "field_offset" : 2560,
-     "referenced_type" : "type-179"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallNonvirtualIntMethodA",
      "field_offset" : 2592,
-     "referenced_type" : "type-181"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualLongMethod",
      "field_offset" : 2624,
-     "referenced_type" : "type-183"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualLongMethodV",
      "field_offset" : 2656,
-     "referenced_type" : "type-185"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallNonvirtualLongMethodA",
      "field_offset" : 2688,
-     "referenced_type" : "type-187"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualFloatMethod",
      "field_offset" : 2720,
-     "referenced_type" : "type-189"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualFloatMethodV",
      "field_offset" : 2752,
-     "referenced_type" : "type-191"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallNonvirtualFloatMethodA",
      "field_offset" : 2784,
-     "referenced_type" : "type-193"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualDoubleMethod",
      "field_offset" : 2816,
-     "referenced_type" : "type-195"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualDoubleMethodV",
      "field_offset" : 2848,
-     "referenced_type" : "type-197"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallNonvirtualDoubleMethodA",
      "field_offset" : 2880,
-     "referenced_type" : "type-199"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualVoidMethod",
      "field_offset" : 2912,
-     "referenced_type" : "type-201"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualVoidMethodV",
      "field_offset" : 2944,
-     "referenced_type" : "type-203"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallNonvirtualVoidMethodA",
      "field_offset" : 2976,
-     "referenced_type" : "type-205"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "GetFieldID",
      "field_offset" : 3008,
-     "referenced_type" : "type-207"
+     "referenced_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E"
     },
     {
      "field_name" : "GetObjectField",
      "field_offset" : 3040,
-     "referenced_type" : "type-209"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE"
     },
     {
      "field_name" : "GetBooleanField",
      "field_offset" : 3072,
-     "referenced_type" : "type-211"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetByteField",
      "field_offset" : 3104,
-     "referenced_type" : "type-213"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetCharField",
      "field_offset" : 3136,
-     "referenced_type" : "type-215"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetShortField",
      "field_offset" : 3168,
-     "referenced_type" : "type-217"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetIntField",
      "field_offset" : 3200,
-     "referenced_type" : "type-219"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetLongField",
      "field_offset" : 3232,
-     "referenced_type" : "type-221"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetFloatField",
      "field_offset" : 3264,
-     "referenced_type" : "type-223"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetDoubleField",
      "field_offset" : 3296,
-     "referenced_type" : "type-225"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "SetObjectField",
      "field_offset" : 3328,
-     "referenced_type" : "type-227"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E"
     },
     {
      "field_name" : "SetBooleanField",
      "field_offset" : 3360,
-     "referenced_type" : "type-229"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDhE"
     },
     {
      "field_name" : "SetByteField",
      "field_offset" : 3392,
-     "referenced_type" : "type-231"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDaE"
     },
     {
      "field_name" : "SetCharField",
      "field_offset" : 3424,
-     "referenced_type" : "type-233"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDtE"
     },
     {
      "field_name" : "SetShortField",
      "field_offset" : 3456,
-     "referenced_type" : "type-235"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDsE"
     },
     {
      "field_name" : "SetIntField",
      "field_offset" : 3488,
-     "referenced_type" : "type-237"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDiE"
     },
     {
      "field_name" : "SetLongField",
      "field_offset" : 3520,
-     "referenced_type" : "type-239"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDxE"
     },
     {
      "field_name" : "SetFloatField",
      "field_offset" : 3552,
-     "referenced_type" : "type-241"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDfE"
     },
     {
      "field_name" : "SetDoubleField",
      "field_offset" : 3584,
-     "referenced_type" : "type-243"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDdE"
     },
     {
      "field_name" : "GetStaticMethodID",
      "field_offset" : 3616,
-     "referenced_type" : "type-85"
+     "referenced_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E"
     },
     {
      "field_name" : "CallStaticObjectMethod",
      "field_offset" : 3648,
-     "referenced_type" : "type-66"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticObjectMethodV",
      "field_offset" : 3680,
-     "referenced_type" : "type-68"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallStaticObjectMethodA",
      "field_offset" : 3712,
-     "referenced_type" : "type-71"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticBooleanMethod",
      "field_offset" : 3744,
-     "referenced_type" : "type-245"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticBooleanMethodV",
      "field_offset" : 3776,
-     "referenced_type" : "type-247"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallStaticBooleanMethodA",
      "field_offset" : 3808,
-     "referenced_type" : "type-249"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticByteMethod",
      "field_offset" : 3840,
-     "referenced_type" : "type-251"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticByteMethodV",
      "field_offset" : 3872,
-     "referenced_type" : "type-253"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallStaticByteMethodA",
      "field_offset" : 3904,
-     "referenced_type" : "type-255"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticCharMethod",
      "field_offset" : 3936,
-     "referenced_type" : "type-257"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticCharMethodV",
      "field_offset" : 3968,
-     "referenced_type" : "type-259"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallStaticCharMethodA",
      "field_offset" : 4000,
-     "referenced_type" : "type-261"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticShortMethod",
      "field_offset" : 4032,
-     "referenced_type" : "type-263"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticShortMethodV",
      "field_offset" : 4064,
-     "referenced_type" : "type-265"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallStaticShortMethodA",
      "field_offset" : 4096,
-     "referenced_type" : "type-267"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticIntMethod",
      "field_offset" : 4128,
-     "referenced_type" : "type-269"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticIntMethodV",
      "field_offset" : 4160,
-     "referenced_type" : "type-271"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallStaticIntMethodA",
      "field_offset" : 4192,
-     "referenced_type" : "type-273"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticLongMethod",
      "field_offset" : 4224,
-     "referenced_type" : "type-275"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticLongMethodV",
      "field_offset" : 4256,
-     "referenced_type" : "type-277"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallStaticLongMethodA",
      "field_offset" : 4288,
-     "referenced_type" : "type-279"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticFloatMethod",
      "field_offset" : 4320,
-     "referenced_type" : "type-281"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticFloatMethodV",
      "field_offset" : 4352,
-     "referenced_type" : "type-283"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallStaticFloatMethodA",
      "field_offset" : 4384,
-     "referenced_type" : "type-285"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticDoubleMethod",
      "field_offset" : 4416,
-     "referenced_type" : "type-287"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticDoubleMethodV",
      "field_offset" : 4448,
-     "referenced_type" : "type-289"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallStaticDoubleMethodA",
      "field_offset" : 4480,
-     "referenced_type" : "type-291"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticVoidMethod",
      "field_offset" : 4512,
-     "referenced_type" : "type-293"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticVoidMethodV",
      "field_offset" : 4544,
-     "referenced_type" : "type-295"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallStaticVoidMethodA",
      "field_offset" : 4576,
-     "referenced_type" : "type-297"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "GetStaticFieldID",
      "field_offset" : 4608,
-     "referenced_type" : "type-207"
+     "referenced_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E"
     },
     {
      "field_name" : "GetStaticObjectField",
      "field_offset" : 4640,
-     "referenced_type" : "type-299"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticBooleanField",
      "field_offset" : 4672,
-     "referenced_type" : "type-301"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticByteField",
      "field_offset" : 4704,
-     "referenced_type" : "type-303"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticCharField",
      "field_offset" : 4736,
-     "referenced_type" : "type-305"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticShortField",
      "field_offset" : 4768,
-     "referenced_type" : "type-307"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticIntField",
      "field_offset" : 4800,
-     "referenced_type" : "type-309"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticLongField",
      "field_offset" : 4832,
-     "referenced_type" : "type-311"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticFloatField",
      "field_offset" : 4864,
-     "referenced_type" : "type-313"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticDoubleField",
      "field_offset" : 4896,
-     "referenced_type" : "type-315"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "SetStaticObjectField",
      "field_offset" : 4928,
-     "referenced_type" : "type-317"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE"
     },
     {
      "field_name" : "SetStaticBooleanField",
      "field_offset" : 4960,
-     "referenced_type" : "type-319"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDhE"
     },
     {
      "field_name" : "SetStaticByteField",
      "field_offset" : 4992,
-     "referenced_type" : "type-321"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDaE"
     },
     {
      "field_name" : "SetStaticCharField",
      "field_offset" : 5024,
-     "referenced_type" : "type-323"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDtE"
     },
     {
      "field_name" : "SetStaticShortField",
      "field_offset" : 5056,
-     "referenced_type" : "type-325"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDsE"
     },
     {
      "field_name" : "SetStaticIntField",
      "field_offset" : 5088,
-     "referenced_type" : "type-327"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDiE"
     },
     {
      "field_name" : "SetStaticLongField",
      "field_offset" : 5120,
-     "referenced_type" : "type-329"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDxE"
     },
     {
      "field_name" : "SetStaticFloatField",
      "field_offset" : 5152,
-     "referenced_type" : "type-331"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDfE"
     },
     {
      "field_name" : "SetStaticDoubleField",
      "field_offset" : 5184,
-     "referenced_type" : "type-333"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDdE"
     },
     {
      "field_name" : "NewString",
      "field_offset" : 5216,
-     "referenced_type" : "type-335"
+     "referenced_type" : "_ZTIPFP8_jstringP7_JNIEnvPKtiE"
     },
     {
      "field_name" : "GetStringLength",
      "field_offset" : 5248,
-     "referenced_type" : "type-341"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jstringE"
     },
     {
      "field_name" : "GetStringChars",
      "field_offset" : 5280,
-     "referenced_type" : "type-343"
+     "referenced_type" : "_ZTIPFPKtP7_JNIEnvP8_jstringPhE"
     },
     {
      "field_name" : "ReleaseStringChars",
      "field_offset" : 5312,
-     "referenced_type" : "type-346"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKtE"
     },
     {
      "field_name" : "NewStringUTF",
      "field_offset" : 5344,
-     "referenced_type" : "type-348"
+     "referenced_type" : "_ZTIPFP8_jstringP7_JNIEnvPKcE"
     },
     {
      "field_name" : "GetStringUTFLength",
      "field_offset" : 5376,
-     "referenced_type" : "type-341"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jstringE"
     },
     {
      "field_name" : "GetStringUTFChars",
      "field_offset" : 5408,
-     "referenced_type" : "type-350"
+     "referenced_type" : "_ZTIPFPKcP7_JNIEnvP8_jstringPhE"
     },
     {
      "field_name" : "ReleaseStringUTFChars",
      "field_offset" : 5440,
-     "referenced_type" : "type-352"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKcE"
     },
     {
      "field_name" : "GetArrayLength",
      "field_offset" : 5472,
-     "referenced_type" : "type-354"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jarrayE"
     },
     {
      "field_name" : "NewObjectArray",
      "field_offset" : 5504,
-     "referenced_type" : "type-358"
+     "referenced_type" : "_ZTIPFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE"
     },
     {
      "field_name" : "GetObjectArrayElement",
      "field_offset" : 5536,
-     "referenced_type" : "type-362"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP13_jobjectArrayiE"
     },
     {
      "field_name" : "SetObjectArrayElement",
      "field_offset" : 5568,
-     "referenced_type" : "type-364"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE"
     },
     {
      "field_name" : "NewBooleanArray",
      "field_offset" : 5600,
-     "referenced_type" : "type-366"
+     "referenced_type" : "_ZTIPFP14_jbooleanArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewByteArray",
      "field_offset" : 5632,
-     "referenced_type" : "type-370"
+     "referenced_type" : "_ZTIPFP11_jbyteArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewCharArray",
      "field_offset" : 5664,
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPFP11_jcharArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewShortArray",
      "field_offset" : 5696,
-     "referenced_type" : "type-378"
+     "referenced_type" : "_ZTIPFP12_jshortArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewIntArray",
      "field_offset" : 5728,
-     "referenced_type" : "type-382"
+     "referenced_type" : "_ZTIPFP10_jintArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewLongArray",
      "field_offset" : 5760,
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTIPFP11_jlongArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewFloatArray",
      "field_offset" : 5792,
-     "referenced_type" : "type-390"
+     "referenced_type" : "_ZTIPFP12_jfloatArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewDoubleArray",
      "field_offset" : 5824,
-     "referenced_type" : "type-394"
+     "referenced_type" : "_ZTIPFP13_jdoubleArrayP7_JNIEnviE"
     },
     {
      "field_name" : "GetBooleanArrayElements",
      "field_offset" : 5856,
-     "referenced_type" : "type-398"
+     "referenced_type" : "_ZTIPFPhP7_JNIEnvP14_jbooleanArrayS_E"
     },
     {
      "field_name" : "GetByteArrayElements",
      "field_offset" : 5888,
-     "referenced_type" : "type-400"
+     "referenced_type" : "_ZTIPFPaP7_JNIEnvP11_jbyteArrayPhE"
     },
     {
      "field_name" : "GetCharArrayElements",
      "field_offset" : 5920,
-     "referenced_type" : "type-403"
+     "referenced_type" : "_ZTIPFPtP7_JNIEnvP11_jcharArrayPhE"
     },
     {
      "field_name" : "GetShortArrayElements",
      "field_offset" : 5952,
-     "referenced_type" : "type-406"
+     "referenced_type" : "_ZTIPFPsP7_JNIEnvP12_jshortArrayPhE"
     },
     {
      "field_name" : "GetIntArrayElements",
      "field_offset" : 5984,
-     "referenced_type" : "type-409"
+     "referenced_type" : "_ZTIPFPiP7_JNIEnvP10_jintArrayPhE"
     },
     {
      "field_name" : "GetLongArrayElements",
      "field_offset" : 6016,
-     "referenced_type" : "type-412"
+     "referenced_type" : "_ZTIPFPxP7_JNIEnvP11_jlongArrayPhE"
     },
     {
      "field_name" : "GetFloatArrayElements",
      "field_offset" : 6048,
-     "referenced_type" : "type-415"
+     "referenced_type" : "_ZTIPFPfP7_JNIEnvP12_jfloatArrayPhE"
     },
     {
      "field_name" : "GetDoubleArrayElements",
      "field_offset" : 6080,
-     "referenced_type" : "type-418"
+     "referenced_type" : "_ZTIPFPdP7_JNIEnvP13_jdoubleArrayPhE"
     },
     {
      "field_name" : "ReleaseBooleanArrayElements",
      "field_offset" : 6112,
-     "referenced_type" : "type-421"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayPhiE"
     },
     {
      "field_name" : "ReleaseByteArrayElements",
      "field_offset" : 6144,
-     "referenced_type" : "type-423"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayPaiE"
     },
     {
      "field_name" : "ReleaseCharArrayElements",
      "field_offset" : 6176,
-     "referenced_type" : "type-425"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayPtiE"
     },
     {
      "field_name" : "ReleaseShortArrayElements",
      "field_offset" : 6208,
-     "referenced_type" : "type-427"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayPsiE"
     },
     {
      "field_name" : "ReleaseIntArrayElements",
      "field_offset" : 6240,
-     "referenced_type" : "type-429"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayPiiE"
     },
     {
      "field_name" : "ReleaseLongArrayElements",
      "field_offset" : 6272,
-     "referenced_type" : "type-431"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayPxiE"
     },
     {
      "field_name" : "ReleaseFloatArrayElements",
      "field_offset" : 6304,
-     "referenced_type" : "type-433"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayPfiE"
     },
     {
      "field_name" : "ReleaseDoubleArrayElements",
      "field_offset" : 6336,
-     "referenced_type" : "type-435"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayPdiE"
     },
     {
      "field_name" : "GetBooleanArrayRegion",
      "field_offset" : 6368,
-     "referenced_type" : "type-437"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPhE"
     },
     {
      "field_name" : "GetByteArrayRegion",
      "field_offset" : 6400,
-     "referenced_type" : "type-439"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPaE"
     },
     {
      "field_name" : "GetCharArrayRegion",
      "field_offset" : 6432,
-     "referenced_type" : "type-441"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPtE"
     },
     {
      "field_name" : "GetShortArrayRegion",
      "field_offset" : 6464,
-     "referenced_type" : "type-443"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPsE"
     },
     {
      "field_name" : "GetIntArrayRegion",
      "field_offset" : 6496,
-     "referenced_type" : "type-445"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPiE"
     },
     {
      "field_name" : "GetLongArrayRegion",
      "field_offset" : 6528,
-     "referenced_type" : "type-447"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPxE"
     },
     {
      "field_name" : "GetFloatArrayRegion",
      "field_offset" : 6560,
-     "referenced_type" : "type-449"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPfE"
     },
     {
      "field_name" : "GetDoubleArrayRegion",
      "field_offset" : 6592,
-     "referenced_type" : "type-451"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPdE"
     },
     {
      "field_name" : "SetBooleanArrayRegion",
      "field_offset" : 6624,
-     "referenced_type" : "type-453"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPKhE"
     },
     {
      "field_name" : "SetByteArrayRegion",
      "field_offset" : 6656,
-     "referenced_type" : "type-457"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPKaE"
     },
     {
      "field_name" : "SetCharArrayRegion",
      "field_offset" : 6688,
-     "referenced_type" : "type-459"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPKtE"
     },
     {
      "field_name" : "SetShortArrayRegion",
      "field_offset" : 6720,
-     "referenced_type" : "type-461"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPKsE"
     },
     {
      "field_name" : "SetIntArrayRegion",
      "field_offset" : 6752,
-     "referenced_type" : "type-465"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPKiE"
     },
     {
      "field_name" : "SetLongArrayRegion",
      "field_offset" : 6784,
-     "referenced_type" : "type-469"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPKxE"
     },
     {
      "field_name" : "SetFloatArrayRegion",
      "field_offset" : 6816,
-     "referenced_type" : "type-473"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPKfE"
     },
     {
      "field_name" : "SetDoubleArrayRegion",
      "field_offset" : 6848,
-     "referenced_type" : "type-477"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPKdE"
     },
     {
      "field_name" : "RegisterNatives",
      "field_offset" : 6880,
-     "referenced_type" : "type-481"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE"
     },
     {
      "field_name" : "UnregisterNatives",
      "field_offset" : 6912,
-     "referenced_type" : "type-486"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassE"
     },
     {
      "field_name" : "MonitorEnter",
      "field_offset" : 6944,
-     "referenced_type" : "type-488"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "MonitorExit",
      "field_offset" : 6976,
-     "referenced_type" : "type-488"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "GetJavaVM",
      "field_offset" : 7008,
-     "referenced_type" : "type-490"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvPP7_JavaVME"
     },
     {
      "field_name" : "GetStringRegion",
      "field_offset" : 7040,
-     "referenced_type" : "type-506"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringiiPtE"
     },
     {
      "field_name" : "GetStringUTFRegion",
      "field_offset" : 7072,
-     "referenced_type" : "type-508"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringiiPcE"
     },
     {
      "field_name" : "GetPrimitiveArrayCritical",
      "field_offset" : 7104,
-     "referenced_type" : "type-510"
+     "referenced_type" : "_ZTIPFPvP7_JNIEnvP7_jarrayPhE"
     },
     {
      "field_name" : "ReleasePrimitiveArrayCritical",
      "field_offset" : 7136,
-     "referenced_type" : "type-512"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jarrayPviE"
     },
     {
      "field_name" : "GetStringCritical",
      "field_offset" : 7168,
-     "referenced_type" : "type-343"
+     "referenced_type" : "_ZTIPFPKtP7_JNIEnvP8_jstringPhE"
     },
     {
      "field_name" : "ReleaseStringCritical",
      "field_offset" : 7200,
-     "referenced_type" : "type-346"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKtE"
     },
     {
      "field_name" : "NewWeakGlobalRef",
      "field_offset" : 7232,
-     "referenced_type" : "type-60"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E"
     },
     {
      "field_name" : "DeleteWeakGlobalRef",
      "field_offset" : 7264,
-     "referenced_type" : "type-62"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "ExceptionCheck",
      "field_offset" : 7296,
-     "referenced_type" : "type-514"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvE"
     },
     {
      "field_name" : "NewDirectByteBuffer",
      "field_offset" : 7328,
-     "referenced_type" : "type-516"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvPvxE"
     },
     {
      "field_name" : "GetDirectBufferAddress",
      "field_offset" : 7360,
-     "referenced_type" : "type-518"
+     "referenced_type" : "_ZTIPFPvP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "GetDirectBufferCapacity",
      "field_offset" : 7392,
-     "referenced_type" : "type-520"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "GetObjectRefType",
      "field_offset" : 7424,
-     "referenced_type" : "type-522"
+     "referenced_type" : "_ZTIPF14jobjectRefTypeP7_JNIEnvP8_jobjectE"
     }
    ],
    "linker_set_key" : "_ZTI18JNINativeInterface",
    "name" : "JNINativeInterface",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "_ZTI18JNINativeInterface",
+   "self_type" : "_ZTI18JNINativeInterface",
    "size" : 932,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12192,46 +11905,46 @@
    [
     {
      "field_name" : "z",
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     },
     {
      "field_name" : "b",
-     "referenced_type" : "type-26"
+     "referenced_type" : "_ZTIa"
     },
     {
      "field_name" : "c",
-     "referenced_type" : "type-76"
+     "referenced_type" : "_ZTIt"
     },
     {
      "field_name" : "s",
-     "referenced_type" : "type-77"
+     "referenced_type" : "_ZTIs"
     },
     {
      "field_name" : "i",
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "j",
-     "referenced_type" : "type-78"
+     "referenced_type" : "_ZTIx"
     },
     {
      "field_name" : "f",
-     "referenced_type" : "type-79"
+     "referenced_type" : "_ZTIf"
     },
     {
      "field_name" : "d",
-     "referenced_type" : "type-80"
+     "referenced_type" : "_ZTId"
     },
     {
      "field_name" : "l",
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI6jvalue",
    "name" : "jvalue",
    "record_kind" : "union",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "_ZTI6jvalue",
+   "self_type" : "_ZTI6jvalue",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12241,13 +11954,13 @@
    [
     {
      "field_name" : "functions",
-     "referenced_type" : "type-9"
+     "referenced_type" : "_ZTIPK18JNINativeInterface"
     }
    ],
    "linker_set_key" : "_ZTI7_JNIEnv",
    "name" : "_JNIEnv",
-   "referenced_type" : "type-8",
-   "self_type" : "type-8",
+   "referenced_type" : "_ZTI7_JNIEnv",
+   "self_type" : "_ZTI7_JNIEnv",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12257,13 +11970,13 @@
    [
     {
      "field_name" : "functions",
-     "referenced_type" : "type-495"
+     "referenced_type" : "_ZTIPK18JNIInvokeInterface"
     }
    ],
    "linker_set_key" : "_ZTI7_JavaVM",
    "name" : "_JavaVM",
-   "referenced_type" : "type-494",
-   "self_type" : "type-494",
+   "referenced_type" : "_ZTI7_JavaVM",
+   "self_type" : "_ZTI7_JavaVM",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12272,14 +11985,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTI8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI7_jarray",
    "name" : "_jarray",
    "record_kind" : "class",
-   "referenced_type" : "type-357",
-   "self_type" : "type-357",
+   "referenced_type" : "_ZTI7_jarray",
+   "self_type" : "_ZTI7_jarray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12288,14 +12001,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTI8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI7_jclass",
    "name" : "_jclass",
    "record_kind" : "class",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "_ZTI7_jclass",
+   "self_type" : "_ZTI7_jclass",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12304,8 +12017,8 @@
    "linker_set_key" : "_ZTI8_jobject",
    "name" : "_jobject",
    "record_kind" : "class",
-   "referenced_type" : "type-6",
-   "self_type" : "type-6",
+   "referenced_type" : "_ZTI8_jobject",
+   "self_type" : "_ZTI8_jobject",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12314,14 +12027,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTI8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI8_jstring",
    "name" : "_jstring",
    "record_kind" : "class",
-   "referenced_type" : "type-338",
-   "self_type" : "type-338",
+   "referenced_type" : "_ZTI8_jstring",
+   "self_type" : "_ZTI8_jstring",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   }
diff --git a/R/64/x86_64/source-based/libbinder_ndk.so.lsdump b/R/64/x86_64/source-based/libbinder_ndk.so.lsdump
index cf39513..dcfdf35 100644
--- a/R/64/x86_64/source-based/libbinder_ndk.so.lsdump
+++ b/R/64/x86_64/source-based/libbinder_ndk.so.lsdump
@@ -8,8 +8,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIDs",
    "name" : "char16_t",
-   "referenced_type" : "type-604",
-   "self_type" : "type-604",
+   "referenced_type" : "_ZTIDs",
+   "self_type" : "_ZTIDs",
    "size" : 2
   },
   {
@@ -17,8 +17,8 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIa",
    "name" : "signed char",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "_ZTIa",
+   "self_type" : "_ZTIa",
    "size" : 1
   },
   {
@@ -27,8 +27,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIb",
    "name" : "bool",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
+   "referenced_type" : "_ZTIb",
+   "self_type" : "_ZTIb",
    "size" : 1
   },
   {
@@ -36,24 +36,24 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIc",
    "name" : "char",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIc",
    "size" : 1
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTId",
    "name" : "double",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
+   "referenced_type" : "_ZTId",
+   "self_type" : "_ZTId",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIf",
    "name" : "float",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
+   "referenced_type" : "_ZTIf",
+   "self_type" : "_ZTIf",
    "size" : 4
   },
   {
@@ -62,8 +62,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIh",
    "name" : "unsigned char",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIh",
    "size" : 1
   },
   {
@@ -71,8 +71,8 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIi",
    "name" : "int",
-   "referenced_type" : "type-15",
-   "self_type" : "type-15",
+   "referenced_type" : "_ZTIi",
+   "self_type" : "_ZTIi",
    "size" : 4
   },
   {
@@ -81,8 +81,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIj",
    "name" : "unsigned int",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "_ZTIj",
+   "self_type" : "_ZTIj",
    "size" : 4
   },
   {
@@ -90,8 +90,8 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIl",
    "name" : "long",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
+   "referenced_type" : "_ZTIl",
+   "self_type" : "_ZTIl",
    "size" : 8
   },
   {
@@ -100,8 +100,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIm",
    "name" : "unsigned long",
-   "referenced_type" : "type-589",
-   "self_type" : "type-589",
+   "referenced_type" : "_ZTIm",
+   "self_type" : "_ZTIm",
    "size" : 8
   },
   {
@@ -109,8 +109,8 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIs",
    "name" : "short",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
+   "referenced_type" : "_ZTIs",
+   "self_type" : "_ZTIs",
    "size" : 2
   },
   {
@@ -119,15 +119,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIt",
    "name" : "unsigned short",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "_ZTIt",
+   "self_type" : "_ZTIt",
    "size" : 2
   },
   {
    "linker_set_key" : "_ZTIv",
    "name" : "void",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12"
+   "referenced_type" : "_ZTIv",
+   "self_type" : "_ZTIv"
   }
  ],
  "elf_functions" :
@@ -466,11 +466,11 @@
    ],
    "linker_set_key" : "_ZTI14jobjectRefType",
    "name" : "jobjectRefType",
-   "referenced_type" : "type-526",
-   "self_type" : "type-526",
+   "referenced_type" : "_ZTI14jobjectRefType",
+   "self_type" : "_ZTI14jobjectRefType",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h",
-   "underlying_type" : "type-527"
+   "underlying_type" : "_ZTIj"
   }
  ],
  "function_types" :
@@ -482,15 +482,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-525",
-   "return_type" : "type-526",
-   "self_type" : "type-525",
+   "referenced_type" : "_ZTIF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTI14jobjectRefType",
+   "self_type" : "_ZTIF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -500,15 +500,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-384",
-   "return_type" : "type-385",
-   "self_type" : "type-384",
+   "referenced_type" : "_ZTIFP10_jintArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP10_jintArray",
+   "self_type" : "_ZTIFP10_jintArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -518,21 +518,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-87",
-   "return_type" : "type-30",
-   "self_type" : "type-87",
+   "referenced_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
+   "return_type" : "_ZTIP10_jmethodID",
+   "self_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -542,15 +542,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-29",
-   "return_type" : "type-30",
-   "self_type" : "type-29",
+   "referenced_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIP10_jmethodID",
+   "self_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -560,15 +560,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-372",
-   "return_type" : "type-373",
-   "self_type" : "type-372",
+   "referenced_type" : "_ZTIFP11_jbyteArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP11_jbyteArray",
+   "self_type" : "_ZTIFP11_jbyteArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -578,15 +578,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-376",
-   "return_type" : "type-377",
-   "self_type" : "type-376",
+   "referenced_type" : "_ZTIFP11_jcharArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP11_jcharArray",
+   "self_type" : "_ZTIFP11_jcharArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -596,15 +596,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-388",
-   "return_type" : "type-389",
-   "self_type" : "type-388",
+   "referenced_type" : "_ZTIFP11_jlongArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP11_jlongArray",
+   "self_type" : "_ZTIFP11_jlongArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -614,12 +614,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     }
    ],
-   "referenced_type" : "type-52",
-   "return_type" : "type-47",
-   "self_type" : "type-52",
+   "referenced_type" : "_ZTIFP11_jthrowableP7_JNIEnvE",
+   "return_type" : "_ZTIP11_jthrowable",
+   "self_type" : "_ZTIFP11_jthrowableP7_JNIEnvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -629,15 +629,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-392",
-   "return_type" : "type-393",
-   "self_type" : "type-392",
+   "referenced_type" : "_ZTIFP12_jfloatArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP12_jfloatArray",
+   "self_type" : "_ZTIFP12_jfloatArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -647,15 +647,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-380",
-   "return_type" : "type-381",
-   "self_type" : "type-380",
+   "referenced_type" : "_ZTIFP12_jshortArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP12_jshortArray",
+   "self_type" : "_ZTIFP12_jshortArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -665,15 +665,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-396",
-   "return_type" : "type-397",
-   "self_type" : "type-396",
+   "referenced_type" : "_ZTIFP13_jdoubleArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP13_jdoubleArray",
+   "self_type" : "_ZTIFP13_jdoubleArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -683,21 +683,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-360",
-   "return_type" : "type-361",
-   "self_type" : "type-360",
+   "referenced_type" : "_ZTIFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
+   "return_type" : "_ZTIP13_jobjectArray",
+   "self_type" : "_ZTIFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -707,15 +707,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-368",
-   "return_type" : "type-369",
-   "self_type" : "type-368",
+   "referenced_type" : "_ZTIFP14_jbooleanArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP14_jbooleanArray",
+   "self_type" : "_ZTIFP14_jbooleanArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -725,15 +725,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-83",
-   "return_type" : "type-18",
-   "self_type" : "type-83",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIP7_jclass",
+   "self_type" : "_ZTIFP7_jclassP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -743,15 +743,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-27",
-   "return_type" : "type-18",
-   "self_type" : "type-27",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvPKcE",
+   "return_type" : "_ZTIP7_jclass",
+   "self_type" : "_ZTIFP7_jclassP7_JNIEnvPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -761,24 +761,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "_ZTIPKa"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-17",
-   "return_type" : "type-18",
-   "self_type" : "type-17",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
+   "return_type" : "_ZTIP7_jclass",
+   "self_type" : "_ZTIFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -788,15 +788,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-40",
-   "return_type" : "type-18",
-   "self_type" : "type-40",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvS0_E",
+   "return_type" : "_ZTIP7_jclass",
+   "self_type" : "_ZTIFP7_jclassP7_JNIEnvS0_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -806,18 +806,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-361"
+     "referenced_type" : "_ZTIP13_jobjectArray"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-364",
-   "return_type" : "type-4",
-   "self_type" : "type-364",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -827,15 +827,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-3",
-   "return_type" : "type-4",
-   "self_type" : "type-3",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -845,21 +845,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-69",
-   "return_type" : "type-4",
-   "self_type" : "type-69",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -869,21 +869,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-73",
-   "return_type" : "type-4",
-   "self_type" : "type-73",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -893,21 +893,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-38"
+     "referenced_type" : "_ZTIh"
     }
    ],
-   "referenced_type" : "type-37",
-   "return_type" : "type-4",
-   "self_type" : "type-37",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -917,18 +917,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-67",
-   "return_type" : "type-4",
-   "self_type" : "type-67",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -938,18 +938,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-301",
-   "return_type" : "type-4",
-   "self_type" : "type-301",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -959,21 +959,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-38"
+     "referenced_type" : "_ZTIh"
     }
    ],
-   "referenced_type" : "type-44",
-   "return_type" : "type-4",
-   "self_type" : "type-44",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -983,18 +983,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-79"
+     "referenced_type" : "_ZTIl"
     }
    ],
-   "referenced_type" : "type-519",
-   "return_type" : "type-4",
-   "self_type" : "type-519",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvPvlE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvPvlE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1004,15 +1004,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-60",
-   "return_type" : "type-4",
-   "self_type" : "type-60",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_E",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1022,21 +1022,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-91",
-   "return_type" : "type-4",
-   "self_type" : "type-91",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1046,21 +1046,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-93",
-   "return_type" : "type-4",
-   "self_type" : "type-93",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1070,18 +1070,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-89",
-   "return_type" : "type-4",
-   "self_type" : "type-89",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1091,24 +1091,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-151",
-   "return_type" : "type-4",
-   "self_type" : "type-151",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1118,24 +1118,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-153",
-   "return_type" : "type-4",
-   "self_type" : "type-153",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1145,21 +1145,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-149",
-   "return_type" : "type-4",
-   "self_type" : "type-149",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1169,18 +1169,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-211",
-   "return_type" : "type-4",
-   "self_type" : "type-211",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1190,15 +1190,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-350",
-   "return_type" : "type-338",
-   "self_type" : "type-350",
+   "referenced_type" : "_ZTIFP8_jstringP7_JNIEnvPKcE",
+   "return_type" : "_ZTIP8_jstring",
+   "self_type" : "_ZTIFP8_jstringP7_JNIEnvPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1208,18 +1208,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-340"
+     "referenced_type" : "_ZTIPKt"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-337",
-   "return_type" : "type-338",
-   "self_type" : "type-337",
+   "referenced_type" : "_ZTIFP8_jstringP7_JNIEnvPKtiE",
+   "return_type" : "_ZTIP8_jstring",
+   "self_type" : "_ZTIFP8_jstringP7_JNIEnvPKtiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1229,21 +1229,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-209",
-   "return_type" : "type-34",
-   "self_type" : "type-209",
+   "referenced_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
+   "return_type" : "_ZTIP9_jfieldID",
+   "self_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1253,15 +1253,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-33",
-   "return_type" : "type-34",
-   "self_type" : "type-33",
+   "referenced_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIP9_jfieldID",
+   "self_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1271,18 +1271,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-338"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-352",
-   "return_type" : "type-20",
-   "self_type" : "type-352",
+   "referenced_type" : "_ZTIFPKcP7_JNIEnvP8_jstringPhE",
+   "return_type" : "_ZTIPKc",
+   "self_type" : "_ZTIFPKcP7_JNIEnvP8_jstringPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1292,18 +1292,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-587"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-589"
+     "referenced_type" : "_ZTIm"
     },
     {
-     "referenced_type" : "type-412"
+     "referenced_type" : "_ZTIPi"
     }
    ],
-   "referenced_type" : "type-588",
-   "return_type" : "type-20",
-   "self_type" : "type-588",
+   "referenced_type" : "_ZTIFPKcPKvmPiE",
+   "return_type" : "_ZTIPKc",
+   "self_type" : "_ZTIFPKcPKvmPiE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1313,18 +1313,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-338"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-345",
-   "return_type" : "type-340",
-   "self_type" : "type-345",
+   "referenced_type" : "_ZTIFPKtP7_JNIEnvP8_jstringPhE",
+   "return_type" : "_ZTIPKt",
+   "self_type" : "_ZTIFPKtP7_JNIEnvP8_jstringPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1334,18 +1334,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-373"
+     "referenced_type" : "_ZTIP11_jbyteArray"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-402",
-   "return_type" : "type-403",
-   "self_type" : "type-402",
+   "referenced_type" : "_ZTIFPaP7_JNIEnvP11_jbyteArrayPhE",
+   "return_type" : "_ZTIPa",
+   "self_type" : "_ZTIFPaP7_JNIEnvP11_jbyteArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1355,18 +1355,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "_ZTIP13_jdoubleArray"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-420",
-   "return_type" : "type-421",
-   "self_type" : "type-420",
+   "referenced_type" : "_ZTIFPdP7_JNIEnvP13_jdoubleArrayPhE",
+   "return_type" : "_ZTIPd",
+   "self_type" : "_ZTIFPdP7_JNIEnvP13_jdoubleArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1376,18 +1376,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-393"
+     "referenced_type" : "_ZTIP12_jfloatArray"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-417",
-   "return_type" : "type-418",
-   "self_type" : "type-417",
+   "referenced_type" : "_ZTIFPfP7_JNIEnvP12_jfloatArrayPhE",
+   "return_type" : "_ZTIPf",
+   "self_type" : "_ZTIFPfP7_JNIEnvP12_jfloatArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1397,18 +1397,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-369"
+     "referenced_type" : "_ZTIP14_jbooleanArray"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-400",
-   "return_type" : "type-346",
-   "self_type" : "type-400",
+   "referenced_type" : "_ZTIFPhP7_JNIEnvP14_jbooleanArrayS_E",
+   "return_type" : "_ZTIPh",
+   "self_type" : "_ZTIFPhP7_JNIEnvP14_jbooleanArrayS_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1418,18 +1418,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "_ZTIP10_jintArray"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-411",
-   "return_type" : "type-412",
-   "self_type" : "type-411",
+   "referenced_type" : "_ZTIFPiP7_JNIEnvP10_jintArrayPhE",
+   "return_type" : "_ZTIPi",
+   "self_type" : "_ZTIFPiP7_JNIEnvP10_jintArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1439,18 +1439,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-389"
+     "referenced_type" : "_ZTIP11_jlongArray"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-414",
-   "return_type" : "type-415",
-   "self_type" : "type-414",
+   "referenced_type" : "_ZTIFPlP7_JNIEnvP11_jlongArrayPhE",
+   "return_type" : "_ZTIPl",
+   "self_type" : "_ZTIFPlP7_JNIEnvP11_jlongArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1460,18 +1460,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-381"
+     "referenced_type" : "_ZTIP12_jshortArray"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-408",
-   "return_type" : "type-409",
-   "self_type" : "type-408",
+   "referenced_type" : "_ZTIFPsP7_JNIEnvP12_jshortArrayPhE",
+   "return_type" : "_ZTIPs",
+   "self_type" : "_ZTIFPsP7_JNIEnvP12_jshortArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1481,18 +1481,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-377"
+     "referenced_type" : "_ZTIP11_jcharArray"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-405",
-   "return_type" : "type-406",
-   "self_type" : "type-405",
+   "referenced_type" : "_ZTIFPtP7_JNIEnvP11_jcharArrayPhE",
+   "return_type" : "_ZTIPt",
+   "self_type" : "_ZTIFPtP7_JNIEnvP11_jcharArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1502,18 +1502,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-357"
+     "referenced_type" : "_ZTIP7_jarray"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-513",
-   "return_type" : "type-11",
-   "self_type" : "type-513",
+   "referenced_type" : "_ZTIFPvP7_JNIEnvP7_jarrayPhE",
+   "return_type" : "_ZTIPv",
+   "self_type" : "_ZTIFPvP7_JNIEnvP7_jarrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1523,15 +1523,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-521",
-   "return_type" : "type-11",
-   "self_type" : "type-521",
+   "referenced_type" : "_ZTIFPvP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIPv",
+   "self_type" : "_ZTIFPvP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1541,12 +1541,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "referenced_type" : "type-569",
-   "return_type" : "type-11",
-   "self_type" : "type-569",
+   "referenced_type" : "_ZTIFPvS_E",
+   "return_type" : "_ZTIPv",
+   "self_type" : "_ZTIFPvS_E",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -1556,21 +1556,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-255",
-   "return_type" : "type-25",
-   "self_type" : "type-255",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1580,21 +1580,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-257",
-   "return_type" : "type-25",
-   "self_type" : "type-257",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1604,18 +1604,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-253",
-   "return_type" : "type-25",
-   "self_type" : "type-253",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1625,18 +1625,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-305",
-   "return_type" : "type-25",
-   "self_type" : "type-305",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1646,21 +1646,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-103",
-   "return_type" : "type-25",
-   "self_type" : "type-103",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1670,21 +1670,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-105",
-   "return_type" : "type-25",
-   "self_type" : "type-105",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1694,18 +1694,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-101",
-   "return_type" : "type-25",
-   "self_type" : "type-101",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1715,24 +1715,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-163",
-   "return_type" : "type-25",
-   "self_type" : "type-163",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1742,24 +1742,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-165",
-   "return_type" : "type-25",
-   "self_type" : "type-165",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1769,21 +1769,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-161",
-   "return_type" : "type-25",
-   "self_type" : "type-161",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1793,18 +1793,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-215",
-   "return_type" : "type-25",
-   "self_type" : "type-215",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1814,15 +1814,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-587"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-589"
+     "referenced_type" : "_ZTIm"
     }
    ],
-   "referenced_type" : "type-614",
-   "return_type" : "type-558",
-   "self_type" : "type-614",
+   "referenced_type" : "_ZTIFbPKvmE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPKvmE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1832,15 +1832,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-593",
-   "return_type" : "type-558",
-   "self_type" : "type-593",
+   "referenced_type" : "_ZTIFbPviE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1850,18 +1850,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-642"
+     "referenced_type" : "_ZTIPPDs"
     }
    ],
-   "referenced_type" : "type-641",
-   "return_type" : "type-558",
-   "self_type" : "type-641",
+   "referenced_type" : "_ZTIFbPviPPDsE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPDsE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1871,18 +1871,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-645"
+     "referenced_type" : "_ZTIPPa"
     }
    ],
-   "referenced_type" : "type-644",
-   "return_type" : "type-558",
-   "self_type" : "type-644",
+   "referenced_type" : "_ZTIFbPviPPaE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPaE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1892,18 +1892,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "_ZTIPPc"
     }
    ],
-   "referenced_type" : "type-583",
-   "return_type" : "type-558",
-   "self_type" : "type-583",
+   "referenced_type" : "_ZTIFbPviPPcE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPcE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1913,18 +1913,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-636"
+     "referenced_type" : "_ZTIPPd"
     }
    ],
-   "referenced_type" : "type-635",
-   "return_type" : "type-558",
-   "self_type" : "type-635",
+   "referenced_type" : "_ZTIFbPviPPdE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPdE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1934,18 +1934,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-633"
+     "referenced_type" : "_ZTIPPf"
     }
    ],
-   "referenced_type" : "type-632",
-   "return_type" : "type-558",
-   "self_type" : "type-632",
+   "referenced_type" : "_ZTIFbPviPPfE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPfE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1955,18 +1955,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-619"
+     "referenced_type" : "_ZTIPPi"
     }
    ],
-   "referenced_type" : "type-618",
-   "return_type" : "type-558",
-   "self_type" : "type-618",
+   "referenced_type" : "_ZTIFbPviPPiE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPiE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1976,18 +1976,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-622"
+     "referenced_type" : "_ZTIPPj"
     }
    ],
-   "referenced_type" : "type-621",
-   "return_type" : "type-558",
-   "self_type" : "type-621",
+   "referenced_type" : "_ZTIFbPviPPjE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPjE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1997,18 +1997,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-625"
+     "referenced_type" : "_ZTIPPl"
     }
    ],
-   "referenced_type" : "type-624",
-   "return_type" : "type-558",
-   "self_type" : "type-624",
+   "referenced_type" : "_ZTIFbPviPPlE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPlE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -2018,18 +2018,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-628"
+     "referenced_type" : "_ZTIPPm"
     }
    ],
-   "referenced_type" : "type-627",
-   "return_type" : "type-558",
-   "self_type" : "type-627",
+   "referenced_type" : "_ZTIFbPviPPmE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPmE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -2039,21 +2039,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-589"
+     "referenced_type" : "_ZTIm"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "_ZTIPPc"
     }
    ],
-   "referenced_type" : "type-595",
-   "return_type" : "type-558",
-   "self_type" : "type-595",
+   "referenced_type" : "_ZTIFbPvmiPPcE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPvmiPPcE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -2063,21 +2063,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-291",
-   "return_type" : "type-81",
-   "self_type" : "type-291",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2087,21 +2087,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-293",
-   "return_type" : "type-81",
-   "self_type" : "type-293",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2111,18 +2111,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-289",
-   "return_type" : "type-81",
-   "self_type" : "type-289",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2132,18 +2132,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-317",
-   "return_type" : "type-81",
-   "self_type" : "type-317",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2153,21 +2153,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-139",
-   "return_type" : "type-81",
-   "self_type" : "type-139",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2177,21 +2177,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-141",
-   "return_type" : "type-81",
-   "self_type" : "type-141",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2201,18 +2201,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-137",
-   "return_type" : "type-81",
-   "self_type" : "type-137",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2222,24 +2222,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-199",
-   "return_type" : "type-81",
-   "self_type" : "type-199",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2249,24 +2249,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-201",
-   "return_type" : "type-81",
-   "self_type" : "type-201",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2276,21 +2276,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-197",
-   "return_type" : "type-81",
-   "self_type" : "type-197",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2300,18 +2300,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-227",
-   "return_type" : "type-81",
-   "self_type" : "type-227",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2321,21 +2321,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-285",
-   "return_type" : "type-80",
-   "self_type" : "type-285",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2345,21 +2345,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-287",
-   "return_type" : "type-80",
-   "self_type" : "type-287",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2369,18 +2369,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-283",
-   "return_type" : "type-80",
-   "self_type" : "type-283",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2390,18 +2390,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-315",
-   "return_type" : "type-80",
-   "self_type" : "type-315",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2411,21 +2411,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-133",
-   "return_type" : "type-80",
-   "self_type" : "type-133",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2435,21 +2435,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-135",
-   "return_type" : "type-80",
-   "self_type" : "type-135",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2459,18 +2459,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-131",
-   "return_type" : "type-80",
-   "self_type" : "type-131",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2480,24 +2480,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-193",
-   "return_type" : "type-80",
-   "self_type" : "type-193",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2507,24 +2507,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-195",
-   "return_type" : "type-80",
-   "self_type" : "type-195",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2534,21 +2534,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-191",
-   "return_type" : "type-80",
-   "self_type" : "type-191",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2558,18 +2558,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-225",
-   "return_type" : "type-80",
-   "self_type" : "type-225",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2579,12 +2579,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     }
    ],
-   "referenced_type" : "type-517",
-   "return_type" : "type-38",
-   "self_type" : "type-517",
+   "referenced_type" : "_ZTIFhP7_JNIEnvE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2594,21 +2594,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-249",
-   "return_type" : "type-38",
-   "self_type" : "type-249",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2618,21 +2618,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-251",
-   "return_type" : "type-38",
-   "self_type" : "type-251",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2642,18 +2642,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-247",
-   "return_type" : "type-38",
-   "self_type" : "type-247",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2663,18 +2663,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-303",
-   "return_type" : "type-38",
-   "self_type" : "type-303",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2684,18 +2684,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-42",
-   "return_type" : "type-38",
-   "self_type" : "type-42",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassS2_E",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassS2_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2705,21 +2705,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-97",
-   "return_type" : "type-38",
-   "self_type" : "type-97",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2729,21 +2729,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-99",
-   "return_type" : "type-38",
-   "self_type" : "type-99",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2753,18 +2753,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-95",
-   "return_type" : "type-38",
-   "self_type" : "type-95",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2774,18 +2774,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-85",
-   "return_type" : "type-38",
-   "self_type" : "type-85",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2795,24 +2795,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-157",
-   "return_type" : "type-38",
-   "self_type" : "type-157",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2822,24 +2822,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-159",
-   "return_type" : "type-38",
-   "self_type" : "type-159",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2849,21 +2849,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-155",
-   "return_type" : "type-38",
-   "self_type" : "type-155",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2873,18 +2873,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-213",
-   "return_type" : "type-38",
-   "self_type" : "type-213",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2894,18 +2894,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-64",
-   "return_type" : "type-38",
-   "self_type" : "type-64",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectS2_E",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectS2_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2915,18 +2915,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-587"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-589"
+     "referenced_type" : "_ZTIm"
     }
    ],
-   "referenced_type" : "type-597",
-   "return_type" : "type-15",
-   "self_type" : "type-597",
+   "referenced_type" : "_ZTIFiP7AParcelPKvmE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7AParcelPKvmE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -2936,12 +2936,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     }
    ],
-   "referenced_type" : "type-14",
-   "return_type" : "type-15",
-   "self_type" : "type-14",
+   "referenced_type" : "_ZTIFiP7_JNIEnvE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2951,15 +2951,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-47"
+     "referenced_type" : "_ZTIP11_jthrowable"
     }
    ],
-   "referenced_type" : "type-46",
-   "return_type" : "type-15",
-   "self_type" : "type-46",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP11_jthrowableE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP11_jthrowableE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2969,15 +2969,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-357"
+     "referenced_type" : "_ZTIP7_jarray"
     }
    ],
-   "referenced_type" : "type-356",
-   "return_type" : "type-15",
-   "self_type" : "type-356",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jarrayE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jarrayE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2987,15 +2987,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-488",
-   "return_type" : "type-15",
-   "self_type" : "type-488",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3005,21 +3005,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-273",
-   "return_type" : "type-15",
-   "self_type" : "type-273",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3029,21 +3029,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-275",
-   "return_type" : "type-15",
-   "self_type" : "type-275",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3053,18 +3053,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-271",
-   "return_type" : "type-15",
-   "self_type" : "type-271",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3074,18 +3074,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-311",
-   "return_type" : "type-15",
-   "self_type" : "type-311",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3095,21 +3095,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "_ZTIPK15JNINativeMethod"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-483",
-   "return_type" : "type-15",
-   "self_type" : "type-483",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3119,18 +3119,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-50",
-   "return_type" : "type-15",
-   "self_type" : "type-50",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassPKcE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3140,15 +3140,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-490",
-   "return_type" : "type-15",
-   "self_type" : "type-490",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3158,21 +3158,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-121",
-   "return_type" : "type-15",
-   "self_type" : "type-121",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3182,21 +3182,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-123",
-   "return_type" : "type-15",
-   "self_type" : "type-123",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3206,18 +3206,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-119",
-   "return_type" : "type-15",
-   "self_type" : "type-119",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3227,24 +3227,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-181",
-   "return_type" : "type-15",
-   "self_type" : "type-181",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3254,24 +3254,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-183",
-   "return_type" : "type-15",
-   "self_type" : "type-183",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3281,21 +3281,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-179",
-   "return_type" : "type-15",
-   "self_type" : "type-179",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3305,18 +3305,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-221",
-   "return_type" : "type-15",
-   "self_type" : "type-221",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3326,15 +3326,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-338"
+     "referenced_type" : "_ZTIP8_jstring"
     }
    ],
-   "referenced_type" : "type-343",
-   "return_type" : "type-15",
-   "self_type" : "type-343",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jstringE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jstringE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3344,15 +3344,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-493"
+     "referenced_type" : "_ZTIPP7_JavaVM"
     }
    ],
-   "referenced_type" : "type-492",
-   "return_type" : "type-15",
-   "self_type" : "type-492",
+   "referenced_type" : "_ZTIFiP7_JNIEnvPP7_JavaVME",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvPP7_JavaVME",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3362,15 +3362,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-58",
-   "return_type" : "type-15",
-   "self_type" : "type-58",
+   "referenced_type" : "_ZTIFiP7_JNIEnviE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3380,12 +3380,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-494"
+     "referenced_type" : "_ZTIP7_JavaVM"
     }
    ],
-   "referenced_type" : "type-500",
-   "return_type" : "type-15",
-   "self_type" : "type-500",
+   "referenced_type" : "_ZTIFiP7_JavaVME",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JavaVME",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3395,18 +3395,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-494"
+     "referenced_type" : "_ZTIP7_JavaVM"
     },
     {
-     "referenced_type" : "type-503"
+     "referenced_type" : "_ZTIPP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "referenced_type" : "type-502",
-   "return_type" : "type-15",
-   "self_type" : "type-502",
+   "referenced_type" : "_ZTIFiP7_JavaVMPP7_JNIEnvPvE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JavaVMPP7_JNIEnvPvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3416,18 +3416,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-494"
+     "referenced_type" : "_ZTIP7_JavaVM"
     },
     {
-     "referenced_type" : "type-506"
+     "referenced_type" : "_ZTIPPv"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-505",
-   "return_type" : "type-15",
-   "self_type" : "type-505",
+   "referenced_type" : "_ZTIFiP7_JavaVMPPviE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JavaVMPPviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3437,21 +3437,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-550"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-553"
+     "referenced_type" : "_ZTIPPKc"
     },
     {
-     "referenced_type" : "type-527"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "referenced_type" : "type-552",
-   "return_type" : "type-15",
-   "self_type" : "type-552",
+   "referenced_type" : "_ZTIFiP8AIBinderiPPKcjE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP8AIBinderiPPKcjE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -3461,21 +3461,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-550"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-527"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-543"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
-     "referenced_type" : "type-546"
+     "referenced_type" : "_ZTIP7AParcel"
     }
    ],
-   "referenced_type" : "type-549",
-   "return_type" : "type-15",
-   "self_type" : "type-549",
+   "referenced_type" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -3485,18 +3485,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-589"
+     "referenced_type" : "_ZTIm"
     }
    ],
-   "referenced_type" : "type-599",
-   "return_type" : "type-15",
-   "self_type" : "type-599",
+   "referenced_type" : "_ZTIFiPK7AParcelPvmE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiPK7AParcelPvmE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -3506,21 +3506,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-279",
-   "return_type" : "type-79",
-   "self_type" : "type-279",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTIl",
+   "self_type" : "_ZTIFlP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3530,21 +3530,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-281",
-   "return_type" : "type-79",
-   "self_type" : "type-281",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIl",
+   "self_type" : "_ZTIFlP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3554,18 +3554,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-277",
-   "return_type" : "type-79",
-   "self_type" : "type-277",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIl",
+   "self_type" : "_ZTIFlP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3575,18 +3575,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-313",
-   "return_type" : "type-79",
-   "self_type" : "type-313",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIl",
+   "self_type" : "_ZTIFlP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3596,15 +3596,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-523",
-   "return_type" : "type-79",
-   "self_type" : "type-523",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIl",
+   "self_type" : "_ZTIFlP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3614,21 +3614,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-127",
-   "return_type" : "type-79",
-   "self_type" : "type-127",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTIl",
+   "self_type" : "_ZTIFlP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3638,21 +3638,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-129",
-   "return_type" : "type-79",
-   "self_type" : "type-129",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIl",
+   "self_type" : "_ZTIFlP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3662,18 +3662,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-125",
-   "return_type" : "type-79",
-   "self_type" : "type-125",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIl",
+   "self_type" : "_ZTIFlP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3683,24 +3683,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-187",
-   "return_type" : "type-79",
-   "self_type" : "type-187",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTIl",
+   "self_type" : "_ZTIFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3710,24 +3710,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-189",
-   "return_type" : "type-79",
-   "self_type" : "type-189",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIl",
+   "self_type" : "_ZTIFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3737,21 +3737,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-185",
-   "return_type" : "type-79",
-   "self_type" : "type-185",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIl",
+   "self_type" : "_ZTIFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3761,18 +3761,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-223",
-   "return_type" : "type-79",
-   "self_type" : "type-223",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIl",
+   "self_type" : "_ZTIFlP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3782,21 +3782,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-267",
-   "return_type" : "type-78",
-   "self_type" : "type-267",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3806,21 +3806,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-269",
-   "return_type" : "type-78",
-   "self_type" : "type-269",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3830,18 +3830,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-265",
-   "return_type" : "type-78",
-   "self_type" : "type-265",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3851,18 +3851,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-309",
-   "return_type" : "type-78",
-   "self_type" : "type-309",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3872,21 +3872,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-115",
-   "return_type" : "type-78",
-   "self_type" : "type-115",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3896,21 +3896,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-117",
-   "return_type" : "type-78",
-   "self_type" : "type-117",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3920,18 +3920,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-113",
-   "return_type" : "type-78",
-   "self_type" : "type-113",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3941,24 +3941,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-175",
-   "return_type" : "type-78",
-   "self_type" : "type-175",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3968,24 +3968,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-177",
-   "return_type" : "type-78",
-   "self_type" : "type-177",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3995,21 +3995,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-173",
-   "return_type" : "type-78",
-   "self_type" : "type-173",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4019,18 +4019,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-219",
-   "return_type" : "type-78",
-   "self_type" : "type-219",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4040,21 +4040,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-261",
-   "return_type" : "type-77",
-   "self_type" : "type-261",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4064,21 +4064,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-263",
-   "return_type" : "type-77",
-   "self_type" : "type-263",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4088,18 +4088,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-259",
-   "return_type" : "type-77",
-   "self_type" : "type-259",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4109,18 +4109,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-307",
-   "return_type" : "type-77",
-   "self_type" : "type-307",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4130,21 +4130,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-109",
-   "return_type" : "type-77",
-   "self_type" : "type-109",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4154,21 +4154,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-111",
-   "return_type" : "type-77",
-   "self_type" : "type-111",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4178,18 +4178,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-107",
-   "return_type" : "type-77",
-   "self_type" : "type-107",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4199,24 +4199,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-169",
-   "return_type" : "type-77",
-   "self_type" : "type-169",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4226,24 +4226,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-171",
-   "return_type" : "type-77",
-   "self_type" : "type-171",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4253,21 +4253,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-167",
-   "return_type" : "type-77",
-   "self_type" : "type-167",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4277,18 +4277,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-217",
-   "return_type" : "type-77",
-   "self_type" : "type-217",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4298,12 +4298,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     }
    ],
-   "referenced_type" : "type-54",
-   "return_type" : "type-12",
-   "self_type" : "type-54",
+   "referenced_type" : "_ZTIFvP7_JNIEnvE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4313,21 +4313,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "_ZTIP10_jintArray"
     },
     {
-     "referenced_type" : "type-412"
+     "referenced_type" : "_ZTIPi"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-431",
-   "return_type" : "type-12",
-   "self_type" : "type-431",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayPiiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP10_jintArrayPiiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4337,24 +4337,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "_ZTIP10_jintArray"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-468"
+     "referenced_type" : "_ZTIPKi"
     }
    ],
-   "referenced_type" : "type-467",
-   "return_type" : "type-12",
-   "self_type" : "type-467",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPKiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPKiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4364,24 +4364,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "_ZTIP10_jintArray"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-412"
+     "referenced_type" : "_ZTIPi"
     }
    ],
-   "referenced_type" : "type-447",
-   "return_type" : "type-12",
-   "self_type" : "type-447",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4391,21 +4391,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-373"
+     "referenced_type" : "_ZTIP11_jbyteArray"
     },
     {
-     "referenced_type" : "type-403"
+     "referenced_type" : "_ZTIPa"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-425",
-   "return_type" : "type-12",
-   "self_type" : "type-425",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayPaiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayPaiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4415,24 +4415,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-373"
+     "referenced_type" : "_ZTIP11_jbyteArray"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "_ZTIPKa"
     }
    ],
-   "referenced_type" : "type-459",
-   "return_type" : "type-12",
-   "self_type" : "type-459",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPKaE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPKaE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4442,24 +4442,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-373"
+     "referenced_type" : "_ZTIP11_jbyteArray"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-403"
+     "referenced_type" : "_ZTIPa"
     }
    ],
-   "referenced_type" : "type-441",
-   "return_type" : "type-12",
-   "self_type" : "type-441",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPaE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPaE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4469,21 +4469,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-377"
+     "referenced_type" : "_ZTIP11_jcharArray"
     },
     {
-     "referenced_type" : "type-406"
+     "referenced_type" : "_ZTIPt"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-427",
-   "return_type" : "type-12",
-   "self_type" : "type-427",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayPtiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayPtiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4493,24 +4493,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-377"
+     "referenced_type" : "_ZTIP11_jcharArray"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-340"
+     "referenced_type" : "_ZTIPKt"
     }
    ],
-   "referenced_type" : "type-461",
-   "return_type" : "type-12",
-   "self_type" : "type-461",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPKtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPKtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4520,24 +4520,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-377"
+     "referenced_type" : "_ZTIP11_jcharArray"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-406"
+     "referenced_type" : "_ZTIPt"
     }
    ],
-   "referenced_type" : "type-443",
-   "return_type" : "type-12",
-   "self_type" : "type-443",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4547,21 +4547,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-389"
+     "referenced_type" : "_ZTIP11_jlongArray"
     },
     {
-     "referenced_type" : "type-415"
+     "referenced_type" : "_ZTIPl"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-433",
-   "return_type" : "type-12",
-   "self_type" : "type-433",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayPliE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayPliE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4571,24 +4571,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-389"
+     "referenced_type" : "_ZTIP11_jlongArray"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-472"
+     "referenced_type" : "_ZTIPKl"
     }
    ],
-   "referenced_type" : "type-471",
-   "return_type" : "type-12",
-   "self_type" : "type-471",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPKlE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPKlE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4598,24 +4598,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-389"
+     "referenced_type" : "_ZTIP11_jlongArray"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-415"
+     "referenced_type" : "_ZTIPl"
     }
    ],
-   "referenced_type" : "type-449",
-   "return_type" : "type-12",
-   "self_type" : "type-449",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPlE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPlE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4625,21 +4625,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-393"
+     "referenced_type" : "_ZTIP12_jfloatArray"
     },
     {
-     "referenced_type" : "type-418"
+     "referenced_type" : "_ZTIPf"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-435",
-   "return_type" : "type-12",
-   "self_type" : "type-435",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayPfiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayPfiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4649,24 +4649,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-393"
+     "referenced_type" : "_ZTIP12_jfloatArray"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-476"
+     "referenced_type" : "_ZTIPKf"
     }
    ],
-   "referenced_type" : "type-475",
-   "return_type" : "type-12",
-   "self_type" : "type-475",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPKfE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPKfE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4676,24 +4676,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-393"
+     "referenced_type" : "_ZTIP12_jfloatArray"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-418"
+     "referenced_type" : "_ZTIPf"
     }
    ],
-   "referenced_type" : "type-451",
-   "return_type" : "type-12",
-   "self_type" : "type-451",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPfE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPfE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4703,21 +4703,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-381"
+     "referenced_type" : "_ZTIP12_jshortArray"
     },
     {
-     "referenced_type" : "type-409"
+     "referenced_type" : "_ZTIPs"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-429",
-   "return_type" : "type-12",
-   "self_type" : "type-429",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayPsiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayPsiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4727,24 +4727,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-381"
+     "referenced_type" : "_ZTIP12_jshortArray"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-464"
+     "referenced_type" : "_ZTIPKs"
     }
    ],
-   "referenced_type" : "type-463",
-   "return_type" : "type-12",
-   "self_type" : "type-463",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPKsE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPKsE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4754,24 +4754,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-381"
+     "referenced_type" : "_ZTIP12_jshortArray"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-409"
+     "referenced_type" : "_ZTIPs"
     }
    ],
-   "referenced_type" : "type-445",
-   "return_type" : "type-12",
-   "self_type" : "type-445",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPsE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPsE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4781,21 +4781,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "_ZTIP13_jdoubleArray"
     },
     {
-     "referenced_type" : "type-421"
+     "referenced_type" : "_ZTIPd"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-437",
-   "return_type" : "type-12",
-   "self_type" : "type-437",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayPdiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayPdiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4805,24 +4805,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "_ZTIP13_jdoubleArray"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-480"
+     "referenced_type" : "_ZTIPKd"
     }
    ],
-   "referenced_type" : "type-479",
-   "return_type" : "type-12",
-   "self_type" : "type-479",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4832,24 +4832,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "_ZTIP13_jdoubleArray"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-421"
+     "referenced_type" : "_ZTIPd"
     }
    ],
-   "referenced_type" : "type-453",
-   "return_type" : "type-12",
-   "self_type" : "type-453",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPdE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPdE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4859,21 +4859,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-361"
+     "referenced_type" : "_ZTIP13_jobjectArray"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-366",
-   "return_type" : "type-12",
-   "self_type" : "type-366",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4883,21 +4883,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-369"
+     "referenced_type" : "_ZTIP14_jbooleanArray"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-423",
-   "return_type" : "type-12",
-   "self_type" : "type-423",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayPhiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayPhiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4907,24 +4907,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-369"
+     "referenced_type" : "_ZTIP14_jbooleanArray"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-456"
+     "referenced_type" : "_ZTIPKh"
     }
    ],
-   "referenced_type" : "type-455",
-   "return_type" : "type-12",
-   "self_type" : "type-455",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4934,24 +4934,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-369"
+     "referenced_type" : "_ZTIP14_jbooleanArray"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-439",
-   "return_type" : "type-12",
-   "self_type" : "type-439",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPhE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4961,21 +4961,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-357"
+     "referenced_type" : "_ZTIP7_jarray"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-515",
-   "return_type" : "type-12",
-   "self_type" : "type-515",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jarrayPviE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jarrayPviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4985,21 +4985,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-297",
-   "return_type" : "type-12",
-   "self_type" : "type-297",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5009,21 +5009,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-299",
-   "return_type" : "type-12",
-   "self_type" : "type-299",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5033,18 +5033,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-295",
-   "return_type" : "type-12",
-   "self_type" : "type-295",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5054,21 +5054,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-319",
-   "return_type" : "type-12",
-   "self_type" : "type-319",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5078,21 +5078,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-25"
+     "referenced_type" : "_ZTIa"
     }
    ],
-   "referenced_type" : "type-323",
-   "return_type" : "type-12",
-   "self_type" : "type-323",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5102,21 +5102,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-81"
+     "referenced_type" : "_ZTId"
     }
    ],
-   "referenced_type" : "type-335",
-   "return_type" : "type-12",
-   "self_type" : "type-335",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5126,21 +5126,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "_ZTIf"
     }
    ],
-   "referenced_type" : "type-333",
-   "return_type" : "type-12",
-   "self_type" : "type-333",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5150,21 +5150,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-38"
+     "referenced_type" : "_ZTIh"
     }
    ],
-   "referenced_type" : "type-321",
-   "return_type" : "type-12",
-   "self_type" : "type-321",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5174,21 +5174,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-329",
-   "return_type" : "type-12",
-   "self_type" : "type-329",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5198,21 +5198,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-79"
+     "referenced_type" : "_ZTIl"
     }
    ],
-   "referenced_type" : "type-331",
-   "return_type" : "type-12",
-   "self_type" : "type-331",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDlE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDlE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5222,21 +5222,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "_ZTIs"
     }
    ],
-   "referenced_type" : "type-327",
-   "return_type" : "type-12",
-   "self_type" : "type-327",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5246,21 +5246,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-77"
+     "referenced_type" : "_ZTIt"
     }
    ],
-   "referenced_type" : "type-325",
-   "return_type" : "type-12",
-   "self_type" : "type-325",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5270,15 +5270,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-62",
-   "return_type" : "type-12",
-   "self_type" : "type-62",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5288,21 +5288,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-145",
-   "return_type" : "type-12",
-   "self_type" : "type-145",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5312,21 +5312,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-147",
-   "return_type" : "type-12",
-   "self_type" : "type-147",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5336,18 +5336,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-143",
-   "return_type" : "type-12",
-   "self_type" : "type-143",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5357,24 +5357,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIP13__va_list_tag"
     }
    ],
-   "referenced_type" : "type-205",
-   "return_type" : "type-12",
-   "self_type" : "type-205",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5384,24 +5384,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-207",
-   "return_type" : "type-12",
-   "self_type" : "type-207",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5411,21 +5411,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-203",
-   "return_type" : "type-12",
-   "self_type" : "type-203",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5435,21 +5435,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-229",
-   "return_type" : "type-12",
-   "self_type" : "type-229",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5459,21 +5459,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-25"
+     "referenced_type" : "_ZTIa"
     }
    ],
-   "referenced_type" : "type-233",
-   "return_type" : "type-12",
-   "self_type" : "type-233",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5483,21 +5483,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-81"
+     "referenced_type" : "_ZTId"
     }
    ],
-   "referenced_type" : "type-245",
-   "return_type" : "type-12",
-   "self_type" : "type-245",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5507,21 +5507,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "_ZTIf"
     }
    ],
-   "referenced_type" : "type-243",
-   "return_type" : "type-12",
-   "self_type" : "type-243",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5531,21 +5531,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-38"
+     "referenced_type" : "_ZTIh"
     }
    ],
-   "referenced_type" : "type-231",
-   "return_type" : "type-12",
-   "self_type" : "type-231",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5555,21 +5555,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-239",
-   "return_type" : "type-12",
-   "self_type" : "type-239",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5579,21 +5579,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-79"
+     "referenced_type" : "_ZTIl"
     }
    ],
-   "referenced_type" : "type-241",
-   "return_type" : "type-12",
-   "self_type" : "type-241",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDlE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDlE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5603,21 +5603,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "_ZTIs"
     }
    ],
-   "referenced_type" : "type-237",
-   "return_type" : "type-12",
-   "self_type" : "type-237",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5627,21 +5627,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-77"
+     "referenced_type" : "_ZTIt"
     }
    ],
-   "referenced_type" : "type-235",
-   "return_type" : "type-12",
-   "self_type" : "type-235",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5651,18 +5651,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-338"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-354",
-   "return_type" : "type-12",
-   "self_type" : "type-354",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringPKcE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jstringPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5672,18 +5672,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-338"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-340"
+     "referenced_type" : "_ZTIPKt"
     }
    ],
-   "referenced_type" : "type-348",
-   "return_type" : "type-12",
-   "self_type" : "type-348",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringPKtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jstringPKtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5693,24 +5693,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-338"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-511"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-510",
-   "return_type" : "type-12",
-   "self_type" : "type-510",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPcE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5720,24 +5720,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-338"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-406"
+     "referenced_type" : "_ZTIPt"
     }
    ],
-   "referenced_type" : "type-508",
-   "return_type" : "type-12",
-   "self_type" : "type-508",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5747,15 +5747,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-56",
-   "return_type" : "type-12",
-   "self_type" : "type-56",
+   "referenced_type" : "_ZTIFvP7_JNIEnvPKcE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5765,12 +5765,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "referenced_type" : "type-561",
-   "return_type" : "type-12",
-   "self_type" : "type-561",
+   "referenced_type" : "_ZTIFvPvE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvPvE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5780,18 +5780,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-589"
+     "referenced_type" : "_ZTIm"
     },
     {
-     "referenced_type" : "type-558"
+     "referenced_type" : "_ZTIb"
     }
    ],
-   "referenced_type" : "type-638",
-   "return_type" : "type-12",
-   "self_type" : "type-638",
+   "referenced_type" : "_ZTIFvPvmbE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvPvmbE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   }
  ],
@@ -5800,7 +5800,7 @@
   {
    "function_name" : "ABinderProcess_joinThreadPool",
    "linker_set_key" : "ABinderProcess_joinThreadPool",
-   "return_type" : "type-12",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_process.h"
   },
   {
@@ -5809,16 +5809,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-527"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "type-558",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_process.h"
   },
   {
    "function_name" : "ABinderProcess_startThreadPool",
    "linker_set_key" : "ABinderProcess_startThreadPool",
-   "return_type" : "type-12",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_process.h"
   },
   {
@@ -5827,19 +5827,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-570"
+     "referenced_type" : "_ZTIPFPvS_E"
     },
     {
-     "referenced_type" : "type-607"
+     "referenced_type" : "_ZTIPFvPvE"
     },
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIPFiP8AIBinderjPK7AParcelPS1_E"
     }
    ],
-   "return_type" : "type-1",
+   "return_type" : "_ZTIP14AIBinder_Class",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5848,13 +5848,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1"
+     "referenced_type" : "_ZTIP14AIBinder_Class"
     },
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "_ZTIPFiP8AIBinderiPPKcjE"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5863,10 +5863,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-563"
+     "referenced_type" : "_ZTIP23AIBinder_DeathRecipient"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5875,10 +5875,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-607"
+     "referenced_type" : "_ZTIPFvPvE"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "_ZTIP23AIBinder_DeathRecipient",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5887,10 +5887,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-566"
+     "referenced_type" : "_ZTIP13AIBinder_Weak"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5899,10 +5899,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-550"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-566",
+   "return_type" : "_ZTIP13AIBinder_Weak",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5911,10 +5911,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-566"
+     "referenced_type" : "_ZTIP13AIBinder_Weak"
     }
    ],
-   "return_type" : "type-550",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5923,13 +5923,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-550"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-557"
+     "referenced_type" : "_ZTIPK14AIBinder_Class"
     }
    ],
-   "return_type" : "type-558",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5938,10 +5938,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-550"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5950,10 +5950,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-550"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5962,19 +5962,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-550"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-553"
+     "referenced_type" : "_ZTIPPKc"
     },
     {
-     "referenced_type" : "type-527"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5983,25 +5983,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "type-575",
+   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder_jni.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
   },
   {
    "function_name" : "AIBinder_getCallingPid",
    "linker_set_key" : "AIBinder_getCallingPid",
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
    "function_name" : "AIBinder_getCallingUid",
    "linker_set_key" : "AIBinder_getCallingUid",
-   "return_type" : "type-527",
+   "return_type" : "_ZTIj",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6010,10 +6010,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-550"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-557",
+   "return_type" : "_ZTIPK14AIBinder_Class",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6022,13 +6022,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-550"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-568"
+     "referenced_type" : "_ZTIPP8AIBinder"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6037,10 +6037,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-550"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-11",
+   "return_type" : "_ZTIPv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6049,10 +6049,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-550"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6061,10 +6061,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-562"
+     "referenced_type" : "_ZTIPK8AIBinder"
     }
    ],
-   "return_type" : "type-558",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6073,10 +6073,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-562"
+     "referenced_type" : "_ZTIPK8AIBinder"
     }
    ],
-   "return_type" : "type-558",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6085,16 +6085,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-550"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-563"
+     "referenced_type" : "_ZTIP23AIBinder_DeathRecipient"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6103,10 +6103,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-647"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/stability.sdump"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h"
   },
   {
@@ -6115,10 +6115,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-647"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/stability.sdump"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h"
   },
   {
@@ -6127,13 +6127,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-557"
+     "referenced_type" : "_ZTIPK14AIBinder_Class"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "return_type" : "type-550",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6142,10 +6142,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-550"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6154,13 +6154,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-550"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-565"
+     "referenced_type" : "_ZTIPP7AParcel"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6169,13 +6169,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-550"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-550"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6184,13 +6184,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-575"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder_jni.sdump"
     }
    ],
-   "return_type" : "type-4",
+   "return_type" : "_ZTIP8_jobject",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
   },
   {
@@ -6199,22 +6199,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-550"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-527"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-565"
+     "referenced_type" : "_ZTIPP7AParcel"
     },
     {
-     "referenced_type" : "type-565"
+     "referenced_type" : "_ZTIPP7AParcel"
     },
     {
-     "referenced_type" : "type-527"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6223,16 +6223,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-550"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-563"
+     "referenced_type" : "_ZTIP23AIBinder_DeathRecipient"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6241,10 +6241,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6253,10 +6253,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6265,13 +6265,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-608"
+     "referenced_type" : "_ZTIPb"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6280,19 +6280,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "_ZTIPFbPviE"
     },
     {
-     "referenced_type" : "type-639"
+     "referenced_type" : "_ZTIPFvPvmbE"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6301,13 +6301,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-403"
+     "referenced_type" : "_ZTIPa"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6316,16 +6316,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-646"
+     "referenced_type" : "_ZTIPFbPviPPaE"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6334,13 +6334,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-609"
+     "referenced_type" : "_ZTIPDs"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6349,16 +6349,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-643"
+     "referenced_type" : "_ZTIPFbPviPPDsE"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6367,13 +6367,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-421"
+     "referenced_type" : "_ZTIPd"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6382,16 +6382,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-637"
+     "referenced_type" : "_ZTIPFbPviPPdE"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6400,13 +6400,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-418"
+     "referenced_type" : "_ZTIPf"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6415,16 +6415,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-634"
+     "referenced_type" : "_ZTIPFbPviPPfE"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6433,13 +6433,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-412"
+     "referenced_type" : "_ZTIPi"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6448,16 +6448,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-620"
+     "referenced_type" : "_ZTIPFbPviPPiE"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6466,13 +6466,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-415"
+     "referenced_type" : "_ZTIPl"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6481,16 +6481,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-626"
+     "referenced_type" : "_ZTIPFbPviPPlE"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6499,13 +6499,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-412"
+     "referenced_type" : "_ZTIPi"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6514,19 +6514,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "_ZTIPFbPviE"
     },
     {
-     "referenced_type" : "type-603"
+     "referenced_type" : "_ZTIPFiPK7AParcelPvmE"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6535,13 +6535,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-582"
+     "referenced_type" : "_ZTIPP7AStatus"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6550,16 +6550,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-585"
+     "referenced_type" : "_ZTIPFbPviPPcE"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6568,19 +6568,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "_ZTIPFbPviE"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "_ZTIPFbPvmiPPcE"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6589,13 +6589,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-640"
+     "referenced_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6604,13 +6604,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-605"
+     "referenced_type" : "_ZTIPj"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6619,16 +6619,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-623"
+     "referenced_type" : "_ZTIPFbPviPPjE"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6637,13 +6637,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "_ZTIPm"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6652,16 +6652,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-631"
+     "referenced_type" : "_ZTIPFbPviPPmE"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6670,13 +6670,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6685,13 +6685,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-558"
+     "referenced_type" : "_ZTIb"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6700,19 +6700,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-587"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-615"
+     "referenced_type" : "_ZTIPFbPKvmE"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6721,13 +6721,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-25"
+     "referenced_type" : "_ZTIa"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6736,16 +6736,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "_ZTIPKa"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6754,13 +6754,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-604"
+     "referenced_type" : "_ZTIDs"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6769,16 +6769,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-617"
+     "referenced_type" : "_ZTIPKDs"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6787,13 +6787,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-81"
+     "referenced_type" : "_ZTId"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6802,16 +6802,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-480"
+     "referenced_type" : "_ZTIPKd"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6820,13 +6820,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "_ZTIf"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6835,16 +6835,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-476"
+     "referenced_type" : "_ZTIPKf"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6853,13 +6853,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6868,16 +6868,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-468"
+     "referenced_type" : "_ZTIPKi"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6886,13 +6886,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-79"
+     "referenced_type" : "_ZTIl"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6901,16 +6901,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-472"
+     "referenced_type" : "_ZTIPKl"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6919,13 +6919,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6934,19 +6934,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-587"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-598"
+     "referenced_type" : "_ZTIPFiP7AParcelPKvmE"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6955,13 +6955,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-579"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6970,16 +6970,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6988,19 +6988,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-587"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-590"
+     "referenced_type" : "_ZTIPFPKcPKvmPiE"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7009,13 +7009,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7024,13 +7024,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-527"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7039,16 +7039,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-611"
+     "referenced_type" : "_ZTIPKj"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7057,13 +7057,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-589"
+     "referenced_type" : "_ZTIm"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7072,16 +7072,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-613"
+     "referenced_type" : "_ZTIPKm"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7090,13 +7090,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-654"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump"
     },
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7105,10 +7105,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-654",
+   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7117,10 +7117,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-654",
+   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7129,10 +7129,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-649"
+     "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7141,10 +7141,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7153,10 +7153,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-649",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7165,13 +7165,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-649",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7180,10 +7180,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-649",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7192,13 +7192,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-649",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7207,10 +7207,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-649",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7219,10 +7219,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-653"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "_ZTIPKc",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7231,10 +7231,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-653"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7243,10 +7243,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-653"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "_ZTIPKc",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7255,10 +7255,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-653"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7267,10 +7267,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-653"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7279,16 +7279,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-653"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-558",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
    "function_name" : "AStatus_newOk",
    "linker_set_key" : "AStatus_newOk",
-   "return_type" : "type-649",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   }
  ],
@@ -7300,8 +7300,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP10_jintArray",
    "name" : "_jintArray *",
-   "referenced_type" : "type-386",
-   "self_type" : "type-385",
+   "referenced_type" : "_ZTI10_jintArray",
+   "self_type" : "_ZTIP10_jintArray",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7309,17 +7309,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP10_jmethodID",
    "name" : "_jmethodID *",
-   "referenced_type" : "type-31",
-   "self_type" : "type-30",
-   "size" : 8,
-   "source_file" : "/libnativehelper/include_jni/jni.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP10_jmethodID",
-   "name" : "_jmethodID *",
-   "referenced_type" : "type-678",
-   "self_type" : "type-677",
+   "referenced_type" : "_ZTI10_jmethodID",
+   "self_type" : "_ZTIP10_jmethodID",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7327,8 +7318,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP11_jbyteArray",
    "name" : "_jbyteArray *",
-   "referenced_type" : "type-374",
-   "self_type" : "type-373",
+   "referenced_type" : "_ZTI11_jbyteArray",
+   "self_type" : "_ZTIP11_jbyteArray",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7336,8 +7327,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP11_jcharArray",
    "name" : "_jcharArray *",
-   "referenced_type" : "type-378",
-   "self_type" : "type-377",
+   "referenced_type" : "_ZTI11_jcharArray",
+   "self_type" : "_ZTIP11_jcharArray",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7345,8 +7336,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP11_jlongArray",
    "name" : "_jlongArray *",
-   "referenced_type" : "type-390",
-   "self_type" : "type-389",
+   "referenced_type" : "_ZTI11_jlongArray",
+   "self_type" : "_ZTIP11_jlongArray",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7354,8 +7345,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP11_jthrowable",
    "name" : "_jthrowable *",
-   "referenced_type" : "type-48",
-   "self_type" : "type-47",
+   "referenced_type" : "_ZTI11_jthrowable",
+   "self_type" : "_ZTIP11_jthrowable",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7363,8 +7354,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP12JavaVMOption",
    "name" : "JavaVMOption *",
-   "referenced_type" : "type-572",
-   "self_type" : "type-574",
+   "referenced_type" : "_ZTI12JavaVMOption",
+   "self_type" : "_ZTIP12JavaVMOption",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7372,8 +7363,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP12_jfloatArray",
    "name" : "_jfloatArray *",
-   "referenced_type" : "type-394",
-   "self_type" : "type-393",
+   "referenced_type" : "_ZTI12_jfloatArray",
+   "self_type" : "_ZTIP12_jfloatArray",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7381,8 +7372,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP12_jshortArray",
    "name" : "_jshortArray *",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "_ZTI12_jshortArray",
+   "self_type" : "_ZTIP12_jshortArray",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7390,35 +7381,17 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP13AIBinder_Weak",
    "name" : "AIBinder_Weak *",
-   "referenced_type" : "type-567",
-   "self_type" : "type-566",
+   "referenced_type" : "_ZTI13AIBinder_Weak",
+   "self_type" : "_ZTIP13AIBinder_Weak",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIP13AIBinder_Weak",
-   "name" : "AIBinder_Weak *",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP13__va_list_tag",
-   "name" : "__va_list_tag *",
-   "referenced_type" : "type-684",
-   "self_type" : "type-683",
-   "size" : 8,
-   "source_file" : "/libnativehelper/include_jni/jni.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIP13__va_list_tag",
    "name" : "__va_list_tag *",
-   "referenced_type" : "type-71",
-   "self_type" : "type-70",
+   "referenced_type" : "_ZTI13__va_list_tag",
+   "self_type" : "_ZTIP13__va_list_tag",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7426,8 +7399,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP13_jdoubleArray",
    "name" : "_jdoubleArray *",
-   "referenced_type" : "type-398",
-   "self_type" : "type-397",
+   "referenced_type" : "_ZTI13_jdoubleArray",
+   "self_type" : "_ZTIP13_jdoubleArray",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7435,8 +7408,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP13_jobjectArray",
    "name" : "_jobjectArray *",
-   "referenced_type" : "type-362",
-   "self_type" : "type-361",
+   "referenced_type" : "_ZTI13_jobjectArray",
+   "self_type" : "_ZTIP13_jobjectArray",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7444,17 +7417,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP14AIBinder_Class",
    "name" : "AIBinder_Class *",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP14AIBinder_Class",
-   "name" : "AIBinder_Class *",
-   "referenced_type" : "type-657",
-   "self_type" : "type-656",
+   "referenced_type" : "_ZTI14AIBinder_Class",
+   "self_type" : "_ZTIP14AIBinder_Class",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -7462,8 +7426,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP14_jbooleanArray",
    "name" : "_jbooleanArray *",
-   "referenced_type" : "type-370",
-   "self_type" : "type-369",
+   "referenced_type" : "_ZTI14_jbooleanArray",
+   "self_type" : "_ZTIP14_jbooleanArray",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7471,17 +7435,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP23AIBinder_DeathRecipient",
    "name" : "AIBinder_DeathRecipient *",
-   "referenced_type" : "type-564",
-   "self_type" : "type-563",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP23AIBinder_DeathRecipient",
-   "name" : "AIBinder_DeathRecipient *",
-   "referenced_type" : "type-672",
-   "self_type" : "type-671",
+   "referenced_type" : "_ZTI23AIBinder_DeathRecipient",
+   "self_type" : "_ZTIP23AIBinder_DeathRecipient",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -7489,71 +7444,17 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP7AParcel",
    "name" : "AParcel *",
-   "referenced_type" : "type-547",
-   "self_type" : "type-546",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP7AParcel",
-   "name" : "AParcel *",
-   "referenced_type" : "type-592",
-   "self_type" : "type-591",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP7AParcel",
-   "name" : "AParcel *",
-   "referenced_type" : "type-664",
-   "self_type" : "type-663",
+   "referenced_type" : "_ZTI7AParcel",
+   "self_type" : "_ZTIP7AParcel",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIP7AParcel",
-   "name" : "AParcel *",
-   "referenced_type" : "type-692",
-   "self_type" : "type-691",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIP7AStatus",
    "name" : "AStatus *",
-   "referenced_type" : "type-537",
-   "self_type" : "type-536",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP7AStatus",
-   "name" : "AStatus *",
-   "referenced_type" : "type-581",
-   "self_type" : "type-580",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP7AStatus",
-   "name" : "AStatus *",
-   "referenced_type" : "type-650",
-   "self_type" : "type-649",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP7AStatus",
-   "name" : "AStatus *",
-   "referenced_type" : "type-689",
-   "self_type" : "type-688",
+   "referenced_type" : "_ZTI7AStatus",
+   "self_type" : "_ZTIP7AStatus",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -7561,8 +7462,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP7_JNIEnv",
    "name" : "_JNIEnv *",
-   "referenced_type" : "type-7",
-   "self_type" : "type-6",
+   "referenced_type" : "_ZTI7_JNIEnv",
+   "self_type" : "_ZTIP7_JNIEnv",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7570,8 +7471,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP7_JavaVM",
    "name" : "_JavaVM *",
-   "referenced_type" : "type-495",
-   "self_type" : "type-494",
+   "referenced_type" : "_ZTI7_JavaVM",
+   "self_type" : "_ZTIP7_JavaVM",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7579,8 +7480,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP7_jarray",
    "name" : "_jarray *",
-   "referenced_type" : "type-358",
-   "self_type" : "type-357",
+   "referenced_type" : "_ZTI7_jarray",
+   "self_type" : "_ZTIP7_jarray",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7588,8 +7489,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP7_jclass",
    "name" : "_jclass *",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
+   "referenced_type" : "_ZTI7_jclass",
+   "self_type" : "_ZTIP7_jclass",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7597,98 +7498,17 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP8AIBinder",
    "name" : "AIBinder *",
-   "referenced_type" : "type-532",
-   "self_type" : "type-531",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-535",
-   "self_type" : "type-534",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-542",
-   "self_type" : "type-541",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-551",
-   "self_type" : "type-550",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-576",
-   "self_type" : "type-575",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-630",
-   "self_type" : "type-629",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-648",
-   "self_type" : "type-647",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-655",
-   "self_type" : "type-654",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-659",
-   "self_type" : "type-658",
+   "referenced_type" : "_ZTI8AIBinder",
+   "self_type" : "_ZTIP8AIBinder",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-682",
-   "self_type" : "type-681",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIP8_jobject",
    "name" : "_jobject *",
-   "referenced_type" : "type-5",
-   "self_type" : "type-4",
+   "referenced_type" : "_ZTI8_jobject",
+   "self_type" : "_ZTIP8_jobject",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7696,8 +7516,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP8_jstring",
    "name" : "_jstring *",
-   "referenced_type" : "type-339",
-   "self_type" : "type-338",
+   "referenced_type" : "_ZTI8_jstring",
+   "self_type" : "_ZTIP8_jstring",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7705,17 +7525,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIP9_jfieldID",
    "name" : "_jfieldID *",
-   "referenced_type" : "type-35",
-   "self_type" : "type-34",
-   "size" : 8,
-   "source_file" : "/libnativehelper/include_jni/jni.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIP9_jfieldID",
-   "name" : "_jfieldID *",
-   "referenced_type" : "type-680",
-   "self_type" : "type-679",
+   "referenced_type" : "_ZTI9_jfieldID",
+   "self_type" : "_ZTIP9_jfieldID",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7723,8 +7534,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPDs",
    "name" : "char16_t *",
-   "referenced_type" : "type-604",
-   "self_type" : "type-609",
+   "referenced_type" : "_ZTIDs",
+   "self_type" : "_ZTIPDs",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -7732,8 +7543,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
    "name" : "jobjectRefType (*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-525",
-   "self_type" : "type-524",
+   "referenced_type" : "_ZTIF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7741,8 +7552,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP10_jintArrayP7_JNIEnviE",
    "name" : "_jintArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-384",
-   "self_type" : "type-383",
+   "referenced_type" : "_ZTIFP10_jintArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP10_jintArrayP7_JNIEnviE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7750,8 +7561,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
    "name" : "_jmethodID *(*)(_JNIEnv *, _jclass *, const char *, const char *)",
-   "referenced_type" : "type-87",
-   "self_type" : "type-86",
+   "referenced_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
+   "self_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7759,8 +7570,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP10_jmethodIDP7_JNIEnvP8_jobjectE",
    "name" : "_jmethodID *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-29",
-   "self_type" : "type-28",
+   "referenced_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP8_jobjectE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7768,8 +7579,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP11_jbyteArrayP7_JNIEnviE",
    "name" : "_jbyteArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-372",
-   "self_type" : "type-371",
+   "referenced_type" : "_ZTIFP11_jbyteArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP11_jbyteArrayP7_JNIEnviE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7777,8 +7588,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP11_jcharArrayP7_JNIEnviE",
    "name" : "_jcharArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-376",
-   "self_type" : "type-375",
+   "referenced_type" : "_ZTIFP11_jcharArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP11_jcharArrayP7_JNIEnviE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7786,8 +7597,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP11_jlongArrayP7_JNIEnviE",
    "name" : "_jlongArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-388",
-   "self_type" : "type-387",
+   "referenced_type" : "_ZTIFP11_jlongArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP11_jlongArrayP7_JNIEnviE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7795,8 +7606,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP11_jthrowableP7_JNIEnvE",
    "name" : "_jthrowable *(*)(_JNIEnv *)",
-   "referenced_type" : "type-52",
-   "self_type" : "type-51",
+   "referenced_type" : "_ZTIFP11_jthrowableP7_JNIEnvE",
+   "self_type" : "_ZTIPFP11_jthrowableP7_JNIEnvE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7804,8 +7615,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP12_jfloatArrayP7_JNIEnviE",
    "name" : "_jfloatArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-392",
-   "self_type" : "type-391",
+   "referenced_type" : "_ZTIFP12_jfloatArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP12_jfloatArrayP7_JNIEnviE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7813,8 +7624,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP12_jshortArrayP7_JNIEnviE",
    "name" : "_jshortArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-380",
-   "self_type" : "type-379",
+   "referenced_type" : "_ZTIFP12_jshortArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP12_jshortArrayP7_JNIEnviE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7822,8 +7633,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP13_jdoubleArrayP7_JNIEnviE",
    "name" : "_jdoubleArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-396",
-   "self_type" : "type-395",
+   "referenced_type" : "_ZTIFP13_jdoubleArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP13_jdoubleArrayP7_JNIEnviE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7831,8 +7642,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
    "name" : "_jobjectArray *(*)(_JNIEnv *, int, _jclass *, _jobject *)",
-   "referenced_type" : "type-360",
-   "self_type" : "type-359",
+   "referenced_type" : "_ZTIFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
+   "self_type" : "_ZTIPFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7840,8 +7651,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP14_jbooleanArrayP7_JNIEnviE",
    "name" : "_jbooleanArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-368",
-   "self_type" : "type-367",
+   "referenced_type" : "_ZTIFP14_jbooleanArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP14_jbooleanArrayP7_JNIEnviE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7849,8 +7660,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP7_jclassP7_JNIEnvP8_jobjectE",
    "name" : "_jclass *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-83",
-   "self_type" : "type-82",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFP7_jclassP7_JNIEnvP8_jobjectE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7858,8 +7669,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP7_jclassP7_JNIEnvPKcE",
    "name" : "_jclass *(*)(_JNIEnv *, const char *)",
-   "referenced_type" : "type-27",
-   "self_type" : "type-26",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvPKcE",
+   "self_type" : "_ZTIPFP7_jclassP7_JNIEnvPKcE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7867,8 +7678,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
    "name" : "_jclass *(*)(_JNIEnv *, const char *, _jobject *, const signed char *, int)",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
+   "self_type" : "_ZTIPFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7876,8 +7687,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP7_jclassP7_JNIEnvS0_E",
    "name" : "_jclass *(*)(_JNIEnv *, _jclass *)",
-   "referenced_type" : "type-40",
-   "self_type" : "type-39",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvS0_E",
+   "self_type" : "_ZTIPFP7_jclassP7_JNIEnvS0_E",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7885,8 +7696,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobjectArray *, int)",
-   "referenced_type" : "type-364",
-   "self_type" : "type-363",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7894,8 +7705,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *)",
-   "referenced_type" : "type-3",
-   "self_type" : "type-65",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7903,8 +7714,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-69",
-   "self_type" : "type-68",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7912,8 +7723,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-73",
-   "self_type" : "type-72",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7921,8 +7732,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jmethodID *, unsigned char)",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7930,8 +7741,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-67",
-   "self_type" : "type-66",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7939,8 +7750,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-301",
-   "self_type" : "type-300",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7948,8 +7759,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jfieldID *, unsigned char)",
-   "referenced_type" : "type-44",
-   "self_type" : "type-43",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7957,8 +7768,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvPvlE",
    "name" : "_jobject *(*)(_JNIEnv *, void *, long)",
-   "referenced_type" : "type-519",
-   "self_type" : "type-518",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvPvlE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvPvlE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7966,8 +7777,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-60",
-   "self_type" : "type-59",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_E",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7975,8 +7786,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDP13__va_list_tagE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-91",
-   "self_type" : "type-90",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7984,8 +7795,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-93",
-   "self_type" : "type-92",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7993,8 +7804,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-89",
-   "self_type" : "type-88",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8002,8 +7813,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDP13__va_list_tagE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-151",
-   "self_type" : "type-150",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8011,8 +7822,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-153",
-   "self_type" : "type-152",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8020,8 +7831,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-149",
-   "self_type" : "type-148",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8029,8 +7840,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-211",
-   "self_type" : "type-210",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8038,8 +7849,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jstringP7_JNIEnvPKcE",
    "name" : "_jstring *(*)(_JNIEnv *, const char *)",
-   "referenced_type" : "type-350",
-   "self_type" : "type-349",
+   "referenced_type" : "_ZTIFP8_jstringP7_JNIEnvPKcE",
+   "self_type" : "_ZTIPFP8_jstringP7_JNIEnvPKcE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8047,8 +7858,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP8_jstringP7_JNIEnvPKtiE",
    "name" : "_jstring *(*)(_JNIEnv *, const unsigned short *, int)",
-   "referenced_type" : "type-337",
-   "self_type" : "type-336",
+   "referenced_type" : "_ZTIFP8_jstringP7_JNIEnvPKtiE",
+   "self_type" : "_ZTIPFP8_jstringP7_JNIEnvPKtiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8056,8 +7867,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
    "name" : "_jfieldID *(*)(_JNIEnv *, _jclass *, const char *, const char *)",
-   "referenced_type" : "type-209",
-   "self_type" : "type-208",
+   "referenced_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
+   "self_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8065,8 +7876,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFP9_jfieldIDP7_JNIEnvP8_jobjectE",
    "name" : "_jfieldID *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-33",
-   "self_type" : "type-32",
+   "referenced_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP8_jobjectE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8074,8 +7885,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFPKcP7_JNIEnvP8_jstringPhE",
    "name" : "const char *(*)(_JNIEnv *, _jstring *, unsigned char *)",
-   "referenced_type" : "type-352",
-   "self_type" : "type-351",
+   "referenced_type" : "_ZTIFPKcP7_JNIEnvP8_jstringPhE",
+   "self_type" : "_ZTIPFPKcP7_JNIEnvP8_jstringPhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8083,8 +7894,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFPKcPKvmPiE",
    "name" : "const char *(*)(const void *, unsigned long, int *)",
-   "referenced_type" : "type-588",
-   "self_type" : "type-590",
+   "referenced_type" : "_ZTIFPKcPKvmPiE",
+   "self_type" : "_ZTIPFPKcPKvmPiE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8092,8 +7903,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFPKtP7_JNIEnvP8_jstringPhE",
    "name" : "const unsigned short *(*)(_JNIEnv *, _jstring *, unsigned char *)",
-   "referenced_type" : "type-345",
-   "self_type" : "type-344",
+   "referenced_type" : "_ZTIFPKtP7_JNIEnvP8_jstringPhE",
+   "self_type" : "_ZTIPFPKtP7_JNIEnvP8_jstringPhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8101,8 +7912,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFPaP7_JNIEnvP11_jbyteArrayPhE",
    "name" : "signed char *(*)(_JNIEnv *, _jbyteArray *, unsigned char *)",
-   "referenced_type" : "type-402",
-   "self_type" : "type-401",
+   "referenced_type" : "_ZTIFPaP7_JNIEnvP11_jbyteArrayPhE",
+   "self_type" : "_ZTIPFPaP7_JNIEnvP11_jbyteArrayPhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8110,8 +7921,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFPdP7_JNIEnvP13_jdoubleArrayPhE",
    "name" : "double *(*)(_JNIEnv *, _jdoubleArray *, unsigned char *)",
-   "referenced_type" : "type-420",
-   "self_type" : "type-419",
+   "referenced_type" : "_ZTIFPdP7_JNIEnvP13_jdoubleArrayPhE",
+   "self_type" : "_ZTIPFPdP7_JNIEnvP13_jdoubleArrayPhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8119,8 +7930,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFPfP7_JNIEnvP12_jfloatArrayPhE",
    "name" : "float *(*)(_JNIEnv *, _jfloatArray *, unsigned char *)",
-   "referenced_type" : "type-417",
-   "self_type" : "type-416",
+   "referenced_type" : "_ZTIFPfP7_JNIEnvP12_jfloatArrayPhE",
+   "self_type" : "_ZTIPFPfP7_JNIEnvP12_jfloatArrayPhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8128,8 +7939,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFPhP7_JNIEnvP14_jbooleanArrayS_E",
    "name" : "unsigned char *(*)(_JNIEnv *, _jbooleanArray *, unsigned char *)",
-   "referenced_type" : "type-400",
-   "self_type" : "type-399",
+   "referenced_type" : "_ZTIFPhP7_JNIEnvP14_jbooleanArrayS_E",
+   "self_type" : "_ZTIPFPhP7_JNIEnvP14_jbooleanArrayS_E",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8137,8 +7948,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFPiP7_JNIEnvP10_jintArrayPhE",
    "name" : "int *(*)(_JNIEnv *, _jintArray *, unsigned char *)",
-   "referenced_type" : "type-411",
-   "self_type" : "type-410",
+   "referenced_type" : "_ZTIFPiP7_JNIEnvP10_jintArrayPhE",
+   "self_type" : "_ZTIPFPiP7_JNIEnvP10_jintArrayPhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8146,8 +7957,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFPlP7_JNIEnvP11_jlongArrayPhE",
    "name" : "long *(*)(_JNIEnv *, _jlongArray *, unsigned char *)",
-   "referenced_type" : "type-414",
-   "self_type" : "type-413",
+   "referenced_type" : "_ZTIFPlP7_JNIEnvP11_jlongArrayPhE",
+   "self_type" : "_ZTIPFPlP7_JNIEnvP11_jlongArrayPhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8155,8 +7966,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFPsP7_JNIEnvP12_jshortArrayPhE",
    "name" : "short *(*)(_JNIEnv *, _jshortArray *, unsigned char *)",
-   "referenced_type" : "type-408",
-   "self_type" : "type-407",
+   "referenced_type" : "_ZTIFPsP7_JNIEnvP12_jshortArrayPhE",
+   "self_type" : "_ZTIPFPsP7_JNIEnvP12_jshortArrayPhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8164,8 +7975,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFPtP7_JNIEnvP11_jcharArrayPhE",
    "name" : "unsigned short *(*)(_JNIEnv *, _jcharArray *, unsigned char *)",
-   "referenced_type" : "type-405",
-   "self_type" : "type-404",
+   "referenced_type" : "_ZTIFPtP7_JNIEnvP11_jcharArrayPhE",
+   "self_type" : "_ZTIPFPtP7_JNIEnvP11_jcharArrayPhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8173,8 +7984,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFPvP7_JNIEnvP7_jarrayPhE",
    "name" : "void *(*)(_JNIEnv *, _jarray *, unsigned char *)",
-   "referenced_type" : "type-513",
-   "self_type" : "type-512",
+   "referenced_type" : "_ZTIFPvP7_JNIEnvP7_jarrayPhE",
+   "self_type" : "_ZTIPFPvP7_JNIEnvP7_jarrayPhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8182,8 +7993,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFPvP7_JNIEnvP8_jobjectE",
    "name" : "void *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-521",
-   "self_type" : "type-520",
+   "referenced_type" : "_ZTIFPvP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFPvP7_JNIEnvP8_jobjectE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8191,8 +8002,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFPvS_E",
    "name" : "void *(*)(void *)",
-   "referenced_type" : "type-569",
-   "self_type" : "type-570",
+   "referenced_type" : "_ZTIFPvS_E",
+   "self_type" : "_ZTIPFPvS_E",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -8200,8 +8011,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "name" : "signed char (*)(_JNIEnv *, _jclass *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-255",
-   "self_type" : "type-254",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8209,8 +8020,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "signed char (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-257",
-   "self_type" : "type-256",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8218,8 +8029,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "signed char (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-253",
-   "self_type" : "type-252",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8227,8 +8038,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "signed char (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-305",
-   "self_type" : "type-304",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8236,8 +8047,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-103",
-   "self_type" : "type-102",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8245,8 +8056,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-105",
-   "self_type" : "type-104",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8254,8 +8065,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-101",
-   "self_type" : "type-100",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8263,8 +8074,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-163",
-   "self_type" : "type-162",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8272,8 +8083,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-165",
-   "self_type" : "type-164",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8281,8 +8092,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-161",
-   "self_type" : "type-160",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8290,8 +8101,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-215",
-   "self_type" : "type-214",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8299,8 +8110,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFbPKvmE",
    "name" : "bool (*)(const void *, unsigned long)",
-   "referenced_type" : "type-614",
-   "self_type" : "type-615",
+   "referenced_type" : "_ZTIFbPKvmE",
+   "self_type" : "_ZTIPFbPKvmE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8308,8 +8119,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFbPviE",
    "name" : "bool (*)(void *, int)",
-   "referenced_type" : "type-593",
-   "self_type" : "type-594",
+   "referenced_type" : "_ZTIFbPviE",
+   "self_type" : "_ZTIPFbPviE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8317,8 +8128,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFbPviPPDsE",
    "name" : "bool (*)(void *, int, char16_t **)",
-   "referenced_type" : "type-641",
-   "self_type" : "type-643",
+   "referenced_type" : "_ZTIFbPviPPDsE",
+   "self_type" : "_ZTIPFbPviPPDsE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8326,8 +8137,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFbPviPPaE",
    "name" : "bool (*)(void *, int, signed char **)",
-   "referenced_type" : "type-644",
-   "self_type" : "type-646",
+   "referenced_type" : "_ZTIFbPviPPaE",
+   "self_type" : "_ZTIPFbPviPPaE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8335,8 +8146,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFbPviPPcE",
    "name" : "bool (*)(void *, int, char **)",
-   "referenced_type" : "type-583",
-   "self_type" : "type-585",
+   "referenced_type" : "_ZTIFbPviPPcE",
+   "self_type" : "_ZTIPFbPviPPcE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8344,8 +8155,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFbPviPPdE",
    "name" : "bool (*)(void *, int, double **)",
-   "referenced_type" : "type-635",
-   "self_type" : "type-637",
+   "referenced_type" : "_ZTIFbPviPPdE",
+   "self_type" : "_ZTIPFbPviPPdE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8353,8 +8164,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFbPviPPfE",
    "name" : "bool (*)(void *, int, float **)",
-   "referenced_type" : "type-632",
-   "self_type" : "type-634",
+   "referenced_type" : "_ZTIFbPviPPfE",
+   "self_type" : "_ZTIPFbPviPPfE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8362,8 +8173,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFbPviPPiE",
    "name" : "bool (*)(void *, int, int **)",
-   "referenced_type" : "type-618",
-   "self_type" : "type-620",
+   "referenced_type" : "_ZTIFbPviPPiE",
+   "self_type" : "_ZTIPFbPviPPiE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8371,8 +8182,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFbPviPPjE",
    "name" : "bool (*)(void *, int, unsigned int **)",
-   "referenced_type" : "type-621",
-   "self_type" : "type-623",
+   "referenced_type" : "_ZTIFbPviPPjE",
+   "self_type" : "_ZTIPFbPviPPjE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8380,8 +8191,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFbPviPPlE",
    "name" : "bool (*)(void *, int, long **)",
-   "referenced_type" : "type-624",
-   "self_type" : "type-626",
+   "referenced_type" : "_ZTIFbPviPPlE",
+   "self_type" : "_ZTIPFbPviPPlE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8389,8 +8200,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFbPviPPmE",
    "name" : "bool (*)(void *, int, unsigned long **)",
-   "referenced_type" : "type-627",
-   "self_type" : "type-631",
+   "referenced_type" : "_ZTIFbPviPPmE",
+   "self_type" : "_ZTIPFbPviPPmE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8398,8 +8209,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFbPvmiPPcE",
    "name" : "bool (*)(void *, unsigned long, int, char **)",
-   "referenced_type" : "type-595",
-   "self_type" : "type-596",
+   "referenced_type" : "_ZTIFbPvmiPPcE",
+   "self_type" : "_ZTIPFbPvmiPPcE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8407,8 +8218,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-291",
-   "self_type" : "type-290",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8416,8 +8227,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-293",
-   "self_type" : "type-292",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8425,8 +8236,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-289",
-   "self_type" : "type-288",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8434,8 +8245,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-317",
-   "self_type" : "type-316",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8443,8 +8254,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8452,8 +8263,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-141",
-   "self_type" : "type-140",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8461,8 +8272,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-137",
-   "self_type" : "type-136",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8470,8 +8281,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-199",
-   "self_type" : "type-198",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8479,8 +8290,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-201",
-   "self_type" : "type-200",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8488,8 +8299,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-197",
-   "self_type" : "type-196",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8497,8 +8308,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-227",
-   "self_type" : "type-226",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8506,8 +8317,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "name" : "float (*)(_JNIEnv *, _jclass *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-285",
-   "self_type" : "type-284",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8515,8 +8326,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "float (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-287",
-   "self_type" : "type-286",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8524,8 +8335,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "float (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-283",
-   "self_type" : "type-282",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8533,8 +8344,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "float (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-315",
-   "self_type" : "type-314",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8542,8 +8353,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-133",
-   "self_type" : "type-132",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8551,8 +8362,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-135",
-   "self_type" : "type-134",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8560,8 +8371,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-131",
-   "self_type" : "type-130",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8569,8 +8380,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-193",
-   "self_type" : "type-192",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8578,8 +8389,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-195",
-   "self_type" : "type-194",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8587,8 +8398,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-191",
-   "self_type" : "type-190",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8596,8 +8407,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-225",
-   "self_type" : "type-224",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8605,8 +8416,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvE",
    "name" : "unsigned char (*)(_JNIEnv *)",
-   "referenced_type" : "type-517",
-   "self_type" : "type-516",
+   "referenced_type" : "_ZTIFhP7_JNIEnvE",
+   "self_type" : "_ZTIPFhP7_JNIEnvE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8614,8 +8425,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-249",
-   "self_type" : "type-248",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8623,8 +8434,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-251",
-   "self_type" : "type-250",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8632,8 +8443,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-247",
-   "self_type" : "type-246",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8641,8 +8452,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-303",
-   "self_type" : "type-302",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8650,8 +8461,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassS2_E",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jclass *)",
-   "referenced_type" : "type-42",
-   "self_type" : "type-41",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassS2_E",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassS2_E",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8659,8 +8470,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8668,8 +8479,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-99",
-   "self_type" : "type-98",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8677,8 +8488,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-95",
-   "self_type" : "type-94",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8686,8 +8497,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jclass *)",
-   "referenced_type" : "type-85",
-   "self_type" : "type-84",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8695,8 +8506,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-157",
-   "self_type" : "type-156",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8704,8 +8515,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-159",
-   "self_type" : "type-158",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8713,8 +8524,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-155",
-   "self_type" : "type-154",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8722,8 +8533,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-213",
-   "self_type" : "type-212",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8731,8 +8542,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectS2_E",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jobject *)",
-   "referenced_type" : "type-64",
-   "self_type" : "type-63",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectS2_E",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectS2_E",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8740,8 +8551,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7AParcelPKvmE",
    "name" : "int (*)(AParcel *, const void *, unsigned long)",
-   "referenced_type" : "type-597",
-   "self_type" : "type-598",
+   "referenced_type" : "_ZTIFiP7AParcelPKvmE",
+   "self_type" : "_ZTIPFiP7AParcelPKvmE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8749,8 +8560,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvE",
    "name" : "int (*)(_JNIEnv *)",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
+   "referenced_type" : "_ZTIFiP7_JNIEnvE",
+   "self_type" : "_ZTIPFiP7_JNIEnvE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8758,8 +8569,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP11_jthrowableE",
    "name" : "int (*)(_JNIEnv *, _jthrowable *)",
-   "referenced_type" : "type-46",
-   "self_type" : "type-45",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP11_jthrowableE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP11_jthrowableE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8767,8 +8578,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jarrayE",
    "name" : "int (*)(_JNIEnv *, _jarray *)",
-   "referenced_type" : "type-356",
-   "self_type" : "type-355",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jarrayE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jarrayE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8776,8 +8587,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassE",
    "name" : "int (*)(_JNIEnv *, _jclass *)",
-   "referenced_type" : "type-488",
-   "self_type" : "type-487",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8785,8 +8596,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "name" : "int (*)(_JNIEnv *, _jclass *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-273",
-   "self_type" : "type-272",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8794,8 +8605,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "int (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-275",
-   "self_type" : "type-274",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8803,8 +8614,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "int (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-271",
-   "self_type" : "type-270",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8812,8 +8623,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "int (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8821,8 +8632,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
    "name" : "int (*)(_JNIEnv *, _jclass *, const JNINativeMethod *, int)",
-   "referenced_type" : "type-483",
-   "self_type" : "type-482",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8830,8 +8641,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassPKcE",
    "name" : "int (*)(_JNIEnv *, _jclass *, const char *)",
-   "referenced_type" : "type-50",
-   "self_type" : "type-49",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassPKcE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassPKcE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8839,8 +8650,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectE",
    "name" : "int (*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-490",
-   "self_type" : "type-489",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8848,8 +8659,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-121",
-   "self_type" : "type-120",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8857,8 +8668,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-123",
-   "self_type" : "type-122",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8866,8 +8677,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-119",
-   "self_type" : "type-118",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8875,8 +8686,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8884,8 +8695,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-183",
-   "self_type" : "type-182",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8893,8 +8704,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-179",
-   "self_type" : "type-178",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8902,8 +8713,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-221",
-   "self_type" : "type-220",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8911,8 +8722,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jstringE",
    "name" : "int (*)(_JNIEnv *, _jstring *)",
-   "referenced_type" : "type-343",
-   "self_type" : "type-342",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jstringE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jstringE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8920,8 +8731,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvPP7_JavaVME",
    "name" : "int (*)(_JNIEnv *, _JavaVM **)",
-   "referenced_type" : "type-492",
-   "self_type" : "type-491",
+   "referenced_type" : "_ZTIFiP7_JNIEnvPP7_JavaVME",
+   "self_type" : "_ZTIPFiP7_JNIEnvPP7_JavaVME",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8929,8 +8740,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JNIEnviE",
    "name" : "int (*)(_JNIEnv *, int)",
-   "referenced_type" : "type-58",
-   "self_type" : "type-57",
+   "referenced_type" : "_ZTIFiP7_JNIEnviE",
+   "self_type" : "_ZTIPFiP7_JNIEnviE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8938,8 +8749,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JavaVME",
    "name" : "int (*)(_JavaVM *)",
-   "referenced_type" : "type-500",
-   "self_type" : "type-499",
+   "referenced_type" : "_ZTIFiP7_JavaVME",
+   "self_type" : "_ZTIPFiP7_JavaVME",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8947,8 +8758,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JavaVMPP7_JNIEnvPvE",
    "name" : "int (*)(_JavaVM *, _JNIEnv **, void *)",
-   "referenced_type" : "type-502",
-   "self_type" : "type-501",
+   "referenced_type" : "_ZTIFiP7_JavaVMPP7_JNIEnvPvE",
+   "self_type" : "_ZTIPFiP7_JavaVMPP7_JNIEnvPvE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8956,8 +8767,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP7_JavaVMPPviE",
    "name" : "int (*)(_JavaVM *, void **, int)",
-   "referenced_type" : "type-505",
-   "self_type" : "type-504",
+   "referenced_type" : "_ZTIFiP7_JavaVMPPviE",
+   "self_type" : "_ZTIPFiP7_JavaVMPPviE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8965,8 +8776,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP8AIBinderiPPKcjE",
    "name" : "int (*)(AIBinder *, int, const char **, unsigned int)",
-   "referenced_type" : "type-552",
-   "self_type" : "type-554",
+   "referenced_type" : "_ZTIFiP8AIBinderiPPKcjE",
+   "self_type" : "_ZTIPFiP8AIBinderiPPKcjE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -8974,8 +8785,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP8AIBinderjPK7AParcelPS1_E",
    "name" : "int (*)(AIBinder *, unsigned int, const AParcel *, AParcel *)",
-   "referenced_type" : "type-549",
-   "self_type" : "type-548",
+   "referenced_type" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
+   "self_type" : "_ZTIPFiP8AIBinderjPK7AParcelPS1_E",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -8983,8 +8794,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFiPK7AParcelPvmE",
    "name" : "int (*)(const AParcel *, void *, unsigned long)",
-   "referenced_type" : "type-599",
-   "self_type" : "type-603",
+   "referenced_type" : "_ZTIFiPK7AParcelPvmE",
+   "self_type" : "_ZTIPFiPK7AParcelPvmE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8992,8 +8803,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFlP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "name" : "long (*)(_JNIEnv *, _jclass *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-279",
-   "self_type" : "type-278",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFlP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9001,8 +8812,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFlP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "long (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-281",
-   "self_type" : "type-280",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFlP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9010,8 +8821,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFlP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "long (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-277",
-   "self_type" : "type-276",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFlP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9019,8 +8830,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFlP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "long (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-313",
-   "self_type" : "type-312",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFlP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9028,8 +8839,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFlP7_JNIEnvP8_jobjectE",
    "name" : "long (*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-523",
-   "self_type" : "type-522",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFlP7_JNIEnvP8_jobjectE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9037,8 +8848,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFlP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
    "name" : "long (*)(_JNIEnv *, _jobject *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-127",
-   "self_type" : "type-126",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFlP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9046,8 +8857,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFlP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "long (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-129",
-   "self_type" : "type-128",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFlP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9055,8 +8866,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFlP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "long (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-125",
-   "self_type" : "type-124",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFlP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9064,8 +8875,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
    "name" : "long (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-187",
-   "self_type" : "type-186",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9073,8 +8884,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "long (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-189",
-   "self_type" : "type-188",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9082,8 +8893,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "long (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-185",
-   "self_type" : "type-184",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9091,8 +8902,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFlP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "long (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-223",
-   "self_type" : "type-222",
+   "referenced_type" : "_ZTIFlP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFlP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9100,8 +8911,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "name" : "short (*)(_JNIEnv *, _jclass *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-267",
-   "self_type" : "type-266",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9109,8 +8920,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "short (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-269",
-   "self_type" : "type-268",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9118,8 +8929,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "short (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-265",
-   "self_type" : "type-264",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9127,8 +8938,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "short (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-309",
-   "self_type" : "type-308",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9136,8 +8947,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-115",
-   "self_type" : "type-114",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9145,8 +8956,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-117",
-   "self_type" : "type-116",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9154,8 +8965,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-113",
-   "self_type" : "type-112",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9163,8 +8974,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-175",
-   "self_type" : "type-174",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9172,8 +8983,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-177",
-   "self_type" : "type-176",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9181,8 +8992,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-173",
-   "self_type" : "type-172",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9190,8 +9001,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-219",
-   "self_type" : "type-218",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9199,8 +9010,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "name" : "unsigned short (*)(_JNIEnv *, _jclass *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-261",
-   "self_type" : "type-260",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9208,8 +9019,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "unsigned short (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-263",
-   "self_type" : "type-262",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9217,8 +9028,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "unsigned short (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-259",
-   "self_type" : "type-258",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9226,8 +9037,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "unsigned short (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-307",
-   "self_type" : "type-306",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9235,8 +9046,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-109",
-   "self_type" : "type-108",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9244,8 +9055,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-111",
-   "self_type" : "type-110",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9253,8 +9064,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-107",
-   "self_type" : "type-106",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9262,8 +9073,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-169",
-   "self_type" : "type-168",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9271,8 +9082,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-171",
-   "self_type" : "type-170",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9280,8 +9091,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-167",
-   "self_type" : "type-166",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9289,8 +9100,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-217",
-   "self_type" : "type-216",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9298,8 +9109,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvE",
    "name" : "void (*)(_JNIEnv *)",
-   "referenced_type" : "type-54",
-   "self_type" : "type-53",
+   "referenced_type" : "_ZTIFvP7_JNIEnvE",
+   "self_type" : "_ZTIPFvP7_JNIEnvE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9307,8 +9118,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP10_jintArrayPiiE",
    "name" : "void (*)(_JNIEnv *, _jintArray *, int *, int)",
-   "referenced_type" : "type-431",
-   "self_type" : "type-430",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayPiiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayPiiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9316,8 +9127,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPKiE",
    "name" : "void (*)(_JNIEnv *, _jintArray *, int, int, const int *)",
-   "referenced_type" : "type-467",
-   "self_type" : "type-466",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPKiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPKiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9325,8 +9136,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPiE",
    "name" : "void (*)(_JNIEnv *, _jintArray *, int, int, int *)",
-   "referenced_type" : "type-447",
-   "self_type" : "type-446",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9334,8 +9145,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayPaiE",
    "name" : "void (*)(_JNIEnv *, _jbyteArray *, signed char *, int)",
-   "referenced_type" : "type-425",
-   "self_type" : "type-424",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayPaiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayPaiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9343,8 +9154,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPKaE",
    "name" : "void (*)(_JNIEnv *, _jbyteArray *, int, int, const signed char *)",
-   "referenced_type" : "type-459",
-   "self_type" : "type-458",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPKaE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPKaE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9352,8 +9163,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPaE",
    "name" : "void (*)(_JNIEnv *, _jbyteArray *, int, int, signed char *)",
-   "referenced_type" : "type-441",
-   "self_type" : "type-440",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPaE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPaE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9361,8 +9172,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jcharArrayPtiE",
    "name" : "void (*)(_JNIEnv *, _jcharArray *, unsigned short *, int)",
-   "referenced_type" : "type-427",
-   "self_type" : "type-426",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayPtiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayPtiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9370,8 +9181,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPKtE",
    "name" : "void (*)(_JNIEnv *, _jcharArray *, int, int, const unsigned short *)",
-   "referenced_type" : "type-461",
-   "self_type" : "type-460",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPKtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPKtE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9379,8 +9190,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPtE",
    "name" : "void (*)(_JNIEnv *, _jcharArray *, int, int, unsigned short *)",
-   "referenced_type" : "type-443",
-   "self_type" : "type-442",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPtE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9388,8 +9199,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jlongArrayPliE",
    "name" : "void (*)(_JNIEnv *, _jlongArray *, long *, int)",
-   "referenced_type" : "type-433",
-   "self_type" : "type-432",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayPliE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayPliE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9397,8 +9208,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPKlE",
    "name" : "void (*)(_JNIEnv *, _jlongArray *, int, int, const long *)",
-   "referenced_type" : "type-471",
-   "self_type" : "type-470",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPKlE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPKlE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9406,8 +9217,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPlE",
    "name" : "void (*)(_JNIEnv *, _jlongArray *, int, int, long *)",
-   "referenced_type" : "type-449",
-   "self_type" : "type-448",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPlE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPlE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9415,8 +9226,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayPfiE",
    "name" : "void (*)(_JNIEnv *, _jfloatArray *, float *, int)",
-   "referenced_type" : "type-435",
-   "self_type" : "type-434",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayPfiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayPfiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9424,8 +9235,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPKfE",
    "name" : "void (*)(_JNIEnv *, _jfloatArray *, int, int, const float *)",
-   "referenced_type" : "type-475",
-   "self_type" : "type-474",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPKfE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPKfE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9433,8 +9244,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPfE",
    "name" : "void (*)(_JNIEnv *, _jfloatArray *, int, int, float *)",
-   "referenced_type" : "type-451",
-   "self_type" : "type-450",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPfE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPfE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9442,8 +9253,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jshortArrayPsiE",
    "name" : "void (*)(_JNIEnv *, _jshortArray *, short *, int)",
-   "referenced_type" : "type-429",
-   "self_type" : "type-428",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayPsiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayPsiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9451,8 +9262,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPKsE",
    "name" : "void (*)(_JNIEnv *, _jshortArray *, int, int, const short *)",
-   "referenced_type" : "type-463",
-   "self_type" : "type-462",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPKsE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPKsE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9460,8 +9271,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPsE",
    "name" : "void (*)(_JNIEnv *, _jshortArray *, int, int, short *)",
-   "referenced_type" : "type-445",
-   "self_type" : "type-444",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPsE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPsE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9469,8 +9280,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayPdiE",
    "name" : "void (*)(_JNIEnv *, _jdoubleArray *, double *, int)",
-   "referenced_type" : "type-437",
-   "self_type" : "type-436",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayPdiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayPdiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9478,8 +9289,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
    "name" : "void (*)(_JNIEnv *, _jdoubleArray *, int, int, const double *)",
-   "referenced_type" : "type-479",
-   "self_type" : "type-478",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9487,8 +9298,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPdE",
    "name" : "void (*)(_JNIEnv *, _jdoubleArray *, int, int, double *)",
-   "referenced_type" : "type-453",
-   "self_type" : "type-452",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPdE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPdE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9496,8 +9307,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
    "name" : "void (*)(_JNIEnv *, _jobjectArray *, int, _jobject *)",
-   "referenced_type" : "type-366",
-   "self_type" : "type-365",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9505,8 +9316,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayPhiE",
    "name" : "void (*)(_JNIEnv *, _jbooleanArray *, unsigned char *, int)",
-   "referenced_type" : "type-423",
-   "self_type" : "type-422",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayPhiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayPhiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9514,8 +9325,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
    "name" : "void (*)(_JNIEnv *, _jbooleanArray *, int, int, const unsigned char *)",
-   "referenced_type" : "type-455",
-   "self_type" : "type-454",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9523,8 +9334,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPhE",
    "name" : "void (*)(_JNIEnv *, _jbooleanArray *, int, int, unsigned char *)",
-   "referenced_type" : "type-439",
-   "self_type" : "type-438",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPhE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9532,8 +9343,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jarrayPviE",
    "name" : "void (*)(_JNIEnv *, _jarray *, void *, int)",
-   "referenced_type" : "type-515",
-   "self_type" : "type-514",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jarrayPviE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jarrayPviE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9541,8 +9352,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-297",
-   "self_type" : "type-296",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9550,8 +9361,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-299",
-   "self_type" : "type-298",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9559,8 +9370,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-295",
-   "self_type" : "type-294",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9568,8 +9379,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, _jobject *)",
-   "referenced_type" : "type-319",
-   "self_type" : "type-318",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9577,8 +9388,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, signed char)",
-   "referenced_type" : "type-323",
-   "self_type" : "type-322",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9586,8 +9397,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, double)",
-   "referenced_type" : "type-335",
-   "self_type" : "type-334",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9595,8 +9406,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, float)",
-   "referenced_type" : "type-333",
-   "self_type" : "type-332",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9604,8 +9415,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, unsigned char)",
-   "referenced_type" : "type-321",
-   "self_type" : "type-320",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9613,8 +9424,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, int)",
-   "referenced_type" : "type-329",
-   "self_type" : "type-328",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9622,8 +9433,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDlE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, long)",
-   "referenced_type" : "type-331",
-   "self_type" : "type-330",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDlE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDlE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9631,8 +9442,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, short)",
-   "referenced_type" : "type-327",
-   "self_type" : "type-326",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9640,8 +9451,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, unsigned short)",
-   "referenced_type" : "type-325",
-   "self_type" : "type-324",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9649,8 +9460,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectE",
    "name" : "void (*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-62",
-   "self_type" : "type-61",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9658,8 +9469,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-145",
-   "self_type" : "type-144",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9667,8 +9478,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-147",
-   "self_type" : "type-146",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9676,8 +9487,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-143",
-   "self_type" : "type-142",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9685,8 +9496,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, __va_list_tag *)",
-   "referenced_type" : "type-205",
-   "self_type" : "type-204",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9694,8 +9505,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-207",
-   "self_type" : "type-206",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9703,8 +9514,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-203",
-   "self_type" : "type-202",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9712,8 +9523,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, _jobject *)",
-   "referenced_type" : "type-229",
-   "self_type" : "type-228",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9721,8 +9532,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, signed char)",
-   "referenced_type" : "type-233",
-   "self_type" : "type-232",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9730,8 +9541,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, double)",
-   "referenced_type" : "type-245",
-   "self_type" : "type-244",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9739,8 +9550,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, float)",
-   "referenced_type" : "type-243",
-   "self_type" : "type-242",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9748,8 +9559,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, unsigned char)",
-   "referenced_type" : "type-231",
-   "self_type" : "type-230",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9757,8 +9568,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, int)",
-   "referenced_type" : "type-239",
-   "self_type" : "type-238",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9766,8 +9577,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDlE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, long)",
-   "referenced_type" : "type-241",
-   "self_type" : "type-240",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDlE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDlE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9775,8 +9586,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, short)",
-   "referenced_type" : "type-237",
-   "self_type" : "type-236",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9784,8 +9595,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, unsigned short)",
-   "referenced_type" : "type-235",
-   "self_type" : "type-234",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9793,8 +9604,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jstringPKcE",
    "name" : "void (*)(_JNIEnv *, _jstring *, const char *)",
-   "referenced_type" : "type-354",
-   "self_type" : "type-353",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringPKcE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKcE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9802,8 +9613,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jstringPKtE",
    "name" : "void (*)(_JNIEnv *, _jstring *, const unsigned short *)",
-   "referenced_type" : "type-348",
-   "self_type" : "type-347",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringPKtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKtE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9811,8 +9622,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jstringiiPcE",
    "name" : "void (*)(_JNIEnv *, _jstring *, int, int, char *)",
-   "referenced_type" : "type-510",
-   "self_type" : "type-509",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPcE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jstringiiPcE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9820,8 +9631,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jstringiiPtE",
    "name" : "void (*)(_JNIEnv *, _jstring *, int, int, unsigned short *)",
-   "referenced_type" : "type-508",
-   "self_type" : "type-507",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jstringiiPtE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9829,8 +9640,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvPKcE",
    "name" : "void (*)(_JNIEnv *, const char *)",
-   "referenced_type" : "type-56",
-   "self_type" : "type-55",
+   "referenced_type" : "_ZTIFvP7_JNIEnvPKcE",
+   "self_type" : "_ZTIPFvP7_JNIEnvPKcE",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9838,8 +9649,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvPvE",
    "name" : "void (*)(void *)",
-   "referenced_type" : "type-561",
-   "self_type" : "type-607",
+   "referenced_type" : "_ZTIFvPvE",
+   "self_type" : "_ZTIPFvPvE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9847,8 +9658,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPFvPvmbE",
    "name" : "void (*)(void *, unsigned long, bool)",
-   "referenced_type" : "type-638",
-   "self_type" : "type-639",
+   "referenced_type" : "_ZTIFvPvmbE",
+   "self_type" : "_ZTIPFvPvmbE",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -9856,8 +9667,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK14AIBinder_Class",
    "name" : "const AIBinder_Class *",
-   "referenced_type" : "type-555",
-   "self_type" : "type-557",
+   "referenced_type" : "_ZTIK14AIBinder_Class",
+   "self_type" : "_ZTIPK14AIBinder_Class",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9865,8 +9676,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK14AIBinder_Class",
    "name" : "const AIBinder_Class *",
-   "referenced_type" : "type-665",
-   "self_type" : "type-667",
+   "referenced_type" : "_ZTIK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9874,8 +9685,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK15JNINativeMethod",
    "name" : "const JNINativeMethod *",
-   "referenced_type" : "type-485",
-   "self_type" : "type-484",
+   "referenced_type" : "_ZTIK15JNINativeMethod",
+   "self_type" : "_ZTIPK15JNINativeMethod",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9883,8 +9694,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK18JNIInvokeInterface",
    "name" : "const JNIInvokeInterface *",
-   "referenced_type" : "type-497",
-   "self_type" : "type-496",
+   "referenced_type" : "_ZTIK18JNIInvokeInterface",
+   "self_type" : "_ZTIPK18JNIInvokeInterface",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9892,8 +9703,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK18JNINativeInterface",
    "name" : "const JNINativeInterface *",
-   "referenced_type" : "type-9",
-   "self_type" : "type-8",
+   "referenced_type" : "_ZTIK18JNINativeInterface",
+   "self_type" : "_ZTIPK18JNINativeInterface",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9901,8 +9712,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK6jvalue",
    "name" : "const jvalue *",
-   "referenced_type" : "type-75",
-   "self_type" : "type-74",
+   "referenced_type" : "_ZTIK6jvalue",
+   "self_type" : "_ZTIPK6jvalue",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9910,17 +9721,17 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK7AParcel",
    "name" : "const AParcel *",
-   "referenced_type" : "type-528",
-   "self_type" : "type-530",
+   "referenced_type" : "_ZTIK7AParcel",
+   "self_type" : "_ZTIPK7AParcel",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK7AParcel",
    "name" : "const AParcel *",
-   "referenced_type" : "type-544",
-   "self_type" : "type-543",
+   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9928,35 +9739,26 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK7AParcel",
    "name" : "const AParcel *",
-   "referenced_type" : "type-601",
-   "self_type" : "type-600",
+   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
+   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "type-660",
-   "self_type" : "type-662",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK7AStatus",
    "name" : "const AStatus *",
-   "referenced_type" : "type-538",
-   "self_type" : "type-540",
+   "referenced_type" : "_ZTIK7AStatus",
+   "self_type" : "_ZTIPK7AStatus",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK7AStatus",
    "name" : "const AStatus *",
-   "referenced_type" : "type-577",
-   "self_type" : "type-579",
+   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
+   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -9964,26 +9766,17 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK7AStatus",
    "name" : "const AStatus *",
-   "referenced_type" : "type-651",
-   "self_type" : "type-653",
+   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK7AStatus",
-   "name" : "const AStatus *",
-   "referenced_type" : "type-685",
-   "self_type" : "type-687",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK8AIBinder",
    "name" : "const AIBinder *",
-   "referenced_type" : "type-559",
-   "self_type" : "type-562",
+   "referenced_type" : "_ZTIK8AIBinder",
+   "self_type" : "_ZTIPK8AIBinder",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9991,8 +9784,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK8AIBinder",
    "name" : "const AIBinder *",
-   "referenced_type" : "type-668",
-   "self_type" : "type-670",
+   "referenced_type" : "_ZTIK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10000,8 +9793,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKDs",
    "name" : "const char16_t *",
-   "referenced_type" : "type-616",
-   "self_type" : "type-617",
+   "referenced_type" : "_ZTIKDs",
+   "self_type" : "_ZTIPKDs",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10009,8 +9802,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKa",
    "name" : "const signed char *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-23",
+   "referenced_type" : "_ZTIKa",
+   "self_type" : "_ZTIPKa",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10018,8 +9811,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKc",
    "name" : "const char *",
-   "referenced_type" : "type-21",
-   "self_type" : "type-20",
+   "referenced_type" : "_ZTIKc",
+   "self_type" : "_ZTIPKc",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10027,8 +9820,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKd",
    "name" : "const double *",
-   "referenced_type" : "type-481",
-   "self_type" : "type-480",
+   "referenced_type" : "_ZTIKd",
+   "self_type" : "_ZTIPKd",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10036,8 +9829,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKf",
    "name" : "const float *",
-   "referenced_type" : "type-477",
-   "self_type" : "type-476",
+   "referenced_type" : "_ZTIKf",
+   "self_type" : "_ZTIPKf",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10045,8 +9838,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKh",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-457",
-   "self_type" : "type-456",
+   "referenced_type" : "_ZTIKh",
+   "self_type" : "_ZTIPKh",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10054,8 +9847,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKi",
    "name" : "const int *",
-   "referenced_type" : "type-469",
-   "self_type" : "type-468",
+   "referenced_type" : "_ZTIKi",
+   "self_type" : "_ZTIPKi",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10063,8 +9856,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKj",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-610",
-   "self_type" : "type-611",
+   "referenced_type" : "_ZTIKj",
+   "self_type" : "_ZTIPKj",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10072,8 +9865,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKl",
    "name" : "const long *",
-   "referenced_type" : "type-473",
-   "self_type" : "type-472",
+   "referenced_type" : "_ZTIKl",
+   "self_type" : "_ZTIPKl",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10081,8 +9874,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKm",
    "name" : "const unsigned long *",
-   "referenced_type" : "type-612",
-   "self_type" : "type-613",
+   "referenced_type" : "_ZTIKm",
+   "self_type" : "_ZTIPKm",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10090,8 +9883,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKs",
    "name" : "const short *",
-   "referenced_type" : "type-465",
-   "self_type" : "type-464",
+   "referenced_type" : "_ZTIKs",
+   "self_type" : "_ZTIPKs",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10099,8 +9892,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKt",
    "name" : "const unsigned short *",
-   "referenced_type" : "type-341",
-   "self_type" : "type-340",
+   "referenced_type" : "_ZTIKt",
+   "self_type" : "_ZTIPKt",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10108,8 +9901,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKv",
    "name" : "const void *",
-   "referenced_type" : "type-586",
-   "self_type" : "type-587",
+   "referenced_type" : "_ZTIKv",
+   "self_type" : "_ZTIPKv",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10117,8 +9910,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP7AParcel",
    "name" : "AParcel **",
-   "referenced_type" : "type-546",
-   "self_type" : "type-565",
+   "referenced_type" : "_ZTIP7AParcel",
+   "self_type" : "_ZTIPP7AParcel",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10126,8 +9919,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP7AParcel",
    "name" : "AParcel **",
-   "referenced_type" : "type-663",
-   "self_type" : "type-673",
+   "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10135,8 +9928,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP7AStatus",
    "name" : "AStatus **",
-   "referenced_type" : "type-580",
-   "self_type" : "type-582",
+   "referenced_type" : "_ZTIP7AStatus",
+   "self_type" : "_ZTIPP7AStatus",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10144,8 +9937,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP7AStatus",
    "name" : "AStatus **",
-   "referenced_type" : "type-688",
-   "self_type" : "type-690",
+   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
+   "self_type" : "_ZTIPP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10153,8 +9946,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP7_JNIEnv",
    "name" : "_JNIEnv **",
-   "referenced_type" : "type-6",
-   "self_type" : "type-503",
+   "referenced_type" : "_ZTIP7_JNIEnv",
+   "self_type" : "_ZTIPP7_JNIEnv",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10162,8 +9955,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP7_JavaVM",
    "name" : "_JavaVM **",
-   "referenced_type" : "type-494",
-   "self_type" : "type-493",
+   "referenced_type" : "_ZTIP7_JavaVM",
+   "self_type" : "_ZTIPP7_JavaVM",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10171,17 +9964,17 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP8AIBinder",
    "name" : "AIBinder **",
-   "referenced_type" : "type-531",
-   "self_type" : "type-533",
+   "referenced_type" : "_ZTIP8AIBinder",
+   "self_type" : "_ZTIPP8AIBinder",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP8AIBinder",
    "name" : "AIBinder **",
-   "referenced_type" : "type-550",
-   "self_type" : "type-568",
+   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10189,26 +9982,17 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPP8AIBinder",
    "name" : "AIBinder **",
-   "referenced_type" : "type-629",
-   "self_type" : "type-640",
+   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
+   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "type-658",
-   "self_type" : "type-676",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPPDs",
    "name" : "char16_t **",
-   "referenced_type" : "type-609",
-   "self_type" : "type-642",
+   "referenced_type" : "_ZTIPDs",
+   "self_type" : "_ZTIPPDs",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10216,8 +10000,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPPKc",
    "name" : "const char **",
-   "referenced_type" : "type-20",
-   "self_type" : "type-553",
+   "referenced_type" : "_ZTIPKc",
+   "self_type" : "_ZTIPPKc",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10225,8 +10009,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPPa",
    "name" : "signed char **",
-   "referenced_type" : "type-403",
-   "self_type" : "type-645",
+   "referenced_type" : "_ZTIPa",
+   "self_type" : "_ZTIPPa",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10234,8 +10018,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPPc",
    "name" : "char **",
-   "referenced_type" : "type-511",
-   "self_type" : "type-584",
+   "referenced_type" : "_ZTIPc",
+   "self_type" : "_ZTIPPc",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10243,8 +10027,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPPd",
    "name" : "double **",
-   "referenced_type" : "type-421",
-   "self_type" : "type-636",
+   "referenced_type" : "_ZTIPd",
+   "self_type" : "_ZTIPPd",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10252,8 +10036,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPPf",
    "name" : "float **",
-   "referenced_type" : "type-418",
-   "self_type" : "type-633",
+   "referenced_type" : "_ZTIPf",
+   "self_type" : "_ZTIPPf",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10261,8 +10045,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPPi",
    "name" : "int **",
-   "referenced_type" : "type-412",
-   "self_type" : "type-619",
+   "referenced_type" : "_ZTIPi",
+   "self_type" : "_ZTIPPi",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10270,8 +10054,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPPj",
    "name" : "unsigned int **",
-   "referenced_type" : "type-605",
-   "self_type" : "type-622",
+   "referenced_type" : "_ZTIPj",
+   "self_type" : "_ZTIPPj",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10279,8 +10063,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPPl",
    "name" : "long **",
-   "referenced_type" : "type-415",
-   "self_type" : "type-625",
+   "referenced_type" : "_ZTIPl",
+   "self_type" : "_ZTIPPl",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10288,8 +10072,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPPm",
    "name" : "unsigned long **",
-   "referenced_type" : "type-606",
-   "self_type" : "type-628",
+   "referenced_type" : "_ZTIPm",
+   "self_type" : "_ZTIPPm",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10297,8 +10081,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPPv",
    "name" : "void **",
-   "referenced_type" : "type-11",
-   "self_type" : "type-506",
+   "referenced_type" : "_ZTIPv",
+   "self_type" : "_ZTIPPv",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10306,8 +10090,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPa",
    "name" : "signed char *",
-   "referenced_type" : "type-25",
-   "self_type" : "type-403",
+   "referenced_type" : "_ZTIa",
+   "self_type" : "_ZTIPa",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10315,8 +10099,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPb",
    "name" : "bool *",
-   "referenced_type" : "type-558",
-   "self_type" : "type-608",
+   "referenced_type" : "_ZTIb",
+   "self_type" : "_ZTIPb",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10324,8 +10108,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPc",
    "name" : "char *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-511",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIPc",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10333,8 +10117,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPd",
    "name" : "double *",
-   "referenced_type" : "type-81",
-   "self_type" : "type-421",
+   "referenced_type" : "_ZTId",
+   "self_type" : "_ZTIPd",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10342,8 +10126,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPf",
    "name" : "float *",
-   "referenced_type" : "type-80",
-   "self_type" : "type-418",
+   "referenced_type" : "_ZTIf",
+   "self_type" : "_ZTIPf",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10351,8 +10135,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPh",
    "name" : "unsigned char *",
-   "referenced_type" : "type-38",
-   "self_type" : "type-346",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIPh",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10360,8 +10144,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPi",
    "name" : "int *",
-   "referenced_type" : "type-15",
-   "self_type" : "type-412",
+   "referenced_type" : "_ZTIi",
+   "self_type" : "_ZTIPi",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10369,8 +10153,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPj",
    "name" : "unsigned int *",
-   "referenced_type" : "type-527",
-   "self_type" : "type-605",
+   "referenced_type" : "_ZTIj",
+   "self_type" : "_ZTIPj",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10378,8 +10162,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPl",
    "name" : "long *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-415",
+   "referenced_type" : "_ZTIl",
+   "self_type" : "_ZTIPl",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10387,8 +10171,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPm",
    "name" : "unsigned long *",
-   "referenced_type" : "type-589",
-   "self_type" : "type-606",
+   "referenced_type" : "_ZTIm",
+   "self_type" : "_ZTIPm",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10396,8 +10180,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPs",
    "name" : "short *",
-   "referenced_type" : "type-78",
-   "self_type" : "type-409",
+   "referenced_type" : "_ZTIs",
+   "self_type" : "_ZTIPs",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10405,8 +10189,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPt",
    "name" : "unsigned short *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-406",
+   "referenced_type" : "_ZTIt",
+   "self_type" : "_ZTIPt",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10414,8 +10198,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPv",
    "name" : "void *",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
+   "referenced_type" : "_ZTIv",
+   "self_type" : "_ZTIPv",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   }
@@ -10427,18 +10211,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK14AIBinder_Class",
    "name" : "const AIBinder_Class",
-   "referenced_type" : "type-556",
-   "self_type" : "type-555",
-   "size" : 40,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK14AIBinder_Class",
-   "name" : "const AIBinder_Class",
-   "referenced_type" : "type-666",
-   "self_type" : "type-665",
+   "referenced_type" : "_ZTI14AIBinder_Class",
+   "self_type" : "_ZTIK14AIBinder_Class",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10447,8 +10221,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK15JNINativeMethod",
    "name" : "const JNINativeMethod",
-   "referenced_type" : "type-486",
-   "self_type" : "type-485",
+   "referenced_type" : "_ZTI15JNINativeMethod",
+   "self_type" : "_ZTIK15JNINativeMethod",
    "size" : 24,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10457,8 +10231,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK18JNIInvokeInterface",
    "name" : "const JNIInvokeInterface",
-   "referenced_type" : "type-498",
-   "self_type" : "type-497",
+   "referenced_type" : "_ZTI18JNIInvokeInterface",
+   "self_type" : "_ZTIK18JNIInvokeInterface",
    "size" : 64,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10467,8 +10241,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK18JNINativeInterface",
    "name" : "const JNINativeInterface",
-   "referenced_type" : "type-10",
-   "self_type" : "type-9",
+   "referenced_type" : "_ZTI18JNINativeInterface",
+   "self_type" : "_ZTIK18JNINativeInterface",
    "size" : 1864,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10477,8 +10251,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK6jvalue",
    "name" : "const jvalue",
-   "referenced_type" : "type-76",
-   "self_type" : "type-75",
+   "referenced_type" : "_ZTI6jvalue",
+   "self_type" : "_ZTIK6jvalue",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10487,38 +10261,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK7AParcel",
    "name" : "const AParcel",
-   "referenced_type" : "type-529",
-   "self_type" : "type-528",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AParcel",
-   "name" : "const AParcel",
-   "referenced_type" : "type-545",
-   "self_type" : "type-544",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AParcel",
-   "name" : "const AParcel",
-   "referenced_type" : "type-602",
-   "self_type" : "type-601",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AParcel",
-   "name" : "const AParcel",
-   "referenced_type" : "type-661",
-   "self_type" : "type-660",
+   "referenced_type" : "_ZTI7AParcel",
+   "self_type" : "_ZTIK7AParcel",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10527,58 +10271,18 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK7AStatus",
    "name" : "const AStatus",
-   "referenced_type" : "type-539",
-   "self_type" : "type-538",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AStatus",
-   "name" : "const AStatus",
-   "referenced_type" : "type-578",
-   "self_type" : "type-577",
+   "referenced_type" : "_ZTI7AStatus",
+   "self_type" : "_ZTIK7AStatus",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIK7AStatus",
-   "name" : "const AStatus",
-   "referenced_type" : "type-652",
-   "self_type" : "type-651",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AStatus",
-   "name" : "const AStatus",
-   "referenced_type" : "type-686",
-   "self_type" : "type-685",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK8AIBinder",
-   "name" : "const AIBinder",
-   "referenced_type" : "type-560",
-   "self_type" : "type-559",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "_ZTIK8AIBinder",
    "name" : "const AIBinder",
-   "referenced_type" : "type-669",
-   "self_type" : "type-668",
+   "referenced_type" : "_ZTI8AIBinder",
+   "self_type" : "_ZTIK8AIBinder",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10587,8 +10291,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKDs",
    "name" : "const char16_t",
-   "referenced_type" : "type-604",
-   "self_type" : "type-616",
+   "referenced_type" : "_ZTIDs",
+   "self_type" : "_ZTIKDs",
    "size" : 2,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10597,8 +10301,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKa",
    "name" : "const signed char",
-   "referenced_type" : "type-25",
-   "self_type" : "type-24",
+   "referenced_type" : "_ZTIa",
+   "self_type" : "_ZTIKa",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10607,8 +10311,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKc",
    "name" : "const char",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIKc",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10617,8 +10321,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKd",
    "name" : "const double",
-   "referenced_type" : "type-81",
-   "self_type" : "type-481",
+   "referenced_type" : "_ZTId",
+   "self_type" : "_ZTIKd",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10627,8 +10331,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKf",
    "name" : "const float",
-   "referenced_type" : "type-80",
-   "self_type" : "type-477",
+   "referenced_type" : "_ZTIf",
+   "self_type" : "_ZTIKf",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10637,8 +10341,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKh",
    "name" : "const unsigned char",
-   "referenced_type" : "type-38",
-   "self_type" : "type-457",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIKh",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10647,8 +10351,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKi",
    "name" : "const int",
-   "referenced_type" : "type-15",
-   "self_type" : "type-469",
+   "referenced_type" : "_ZTIi",
+   "self_type" : "_ZTIKi",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10657,8 +10361,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKj",
    "name" : "const unsigned int",
-   "referenced_type" : "type-527",
-   "self_type" : "type-610",
+   "referenced_type" : "_ZTIj",
+   "self_type" : "_ZTIKj",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10667,8 +10371,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKl",
    "name" : "const long",
-   "referenced_type" : "type-79",
-   "self_type" : "type-473",
+   "referenced_type" : "_ZTIl",
+   "self_type" : "_ZTIKl",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10677,8 +10381,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKm",
    "name" : "const unsigned long",
-   "referenced_type" : "type-589",
-   "self_type" : "type-612",
+   "referenced_type" : "_ZTIm",
+   "self_type" : "_ZTIKm",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10687,8 +10391,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKs",
    "name" : "const short",
-   "referenced_type" : "type-78",
-   "self_type" : "type-465",
+   "referenced_type" : "_ZTIs",
+   "self_type" : "_ZTIKs",
    "size" : 2,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10697,8 +10401,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKt",
    "name" : "const unsigned short",
-   "referenced_type" : "type-77",
-   "self_type" : "type-341",
+   "referenced_type" : "_ZTIt",
+   "self_type" : "_ZTIKt",
    "size" : 2,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10706,8 +10410,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKv",
    "name" : "const void",
-   "referenced_type" : "type-12",
-   "self_type" : "type-586",
+   "referenced_type" : "_ZTIv",
+   "self_type" : "_ZTIKv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   }
  ],
@@ -10718,14 +10422,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-358"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI10_jintArray",
    "name" : "_jintArray",
    "record_kind" : "class",
-   "referenced_type" : "type-386",
-   "self_type" : "type-386",
+   "referenced_type" : "_ZTI10_jintArray",
+   "self_type" : "_ZTI10_jintArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10734,14 +10438,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-358"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI11_jbyteArray",
    "name" : "_jbyteArray",
    "record_kind" : "class",
-   "referenced_type" : "type-374",
-   "self_type" : "type-374",
+   "referenced_type" : "_ZTI11_jbyteArray",
+   "self_type" : "_ZTI11_jbyteArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10750,14 +10454,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-358"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI11_jcharArray",
    "name" : "_jcharArray",
    "record_kind" : "class",
-   "referenced_type" : "type-378",
-   "self_type" : "type-378",
+   "referenced_type" : "_ZTI11_jcharArray",
+   "self_type" : "_ZTI11_jcharArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10766,14 +10470,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-358"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI11_jlongArray",
    "name" : "_jlongArray",
    "record_kind" : "class",
-   "referenced_type" : "type-390",
-   "self_type" : "type-390",
+   "referenced_type" : "_ZTI11_jlongArray",
+   "self_type" : "_ZTI11_jlongArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10782,14 +10486,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTI8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI11_jthrowable",
    "name" : "_jthrowable",
    "record_kind" : "class",
-   "referenced_type" : "type-48",
-   "self_type" : "type-48",
+   "referenced_type" : "_ZTI11_jthrowable",
+   "self_type" : "_ZTI11_jthrowable",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10799,18 +10503,18 @@
    [
     {
      "field_name" : "optionString",
-     "referenced_type" : "type-20"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "field_name" : "extraInfo",
      "field_offset" : 64,
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     }
    ],
    "linker_set_key" : "_ZTI12JavaVMOption",
    "name" : "JavaVMOption",
-   "referenced_type" : "type-572",
-   "self_type" : "type-572",
+   "referenced_type" : "_ZTI12JavaVMOption",
+   "self_type" : "_ZTI12JavaVMOption",
    "size" : 16,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10819,14 +10523,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-358"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI12_jfloatArray",
    "name" : "_jfloatArray",
    "record_kind" : "class",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
+   "referenced_type" : "_ZTI12_jfloatArray",
+   "self_type" : "_ZTI12_jfloatArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10835,14 +10539,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-358"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI12_jshortArray",
    "name" : "_jshortArray",
    "record_kind" : "class",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
+   "referenced_type" : "_ZTI12_jshortArray",
+   "self_type" : "_ZTI12_jshortArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10851,14 +10555,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-358"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI13_jdoubleArray",
    "name" : "_jdoubleArray",
    "record_kind" : "class",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
+   "referenced_type" : "_ZTI13_jdoubleArray",
+   "self_type" : "_ZTI13_jdoubleArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10867,14 +10571,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-358"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI13_jobjectArray",
    "name" : "_jobjectArray",
    "record_kind" : "class",
-   "referenced_type" : "type-362",
-   "self_type" : "type-362",
+   "referenced_type" : "_ZTI13_jobjectArray",
+   "self_type" : "_ZTI13_jobjectArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10884,28 +10588,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "nOptions",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "options",
      "field_offset" : 64,
-     "referenced_type" : "type-574"
+     "referenced_type" : "_ZTIP12JavaVMOption"
     },
     {
      "field_name" : "ignoreUnrecognized",
      "field_offset" : 128,
-     "referenced_type" : "type-38"
+     "referenced_type" : "_ZTIh"
     }
    ],
    "linker_set_key" : "_ZTI14JavaVMInitArgs",
    "name" : "JavaVMInitArgs",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
+   "referenced_type" : "_ZTI14JavaVMInitArgs",
+   "self_type" : "_ZTI14JavaVMInitArgs",
    "size" : 24,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10914,14 +10618,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-358"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI14_jbooleanArray",
    "name" : "_jbooleanArray",
    "record_kind" : "class",
-   "referenced_type" : "type-370",
-   "self_type" : "type-370",
+   "referenced_type" : "_ZTI14_jbooleanArray",
+   "self_type" : "_ZTI14_jbooleanArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10931,23 +10635,23 @@
    [
     {
      "field_name" : "name",
-     "referenced_type" : "type-20"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "field_name" : "signature",
      "field_offset" : 64,
-     "referenced_type" : "type-20"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "field_name" : "fnPtr",
      "field_offset" : 128,
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     }
    ],
    "linker_set_key" : "_ZTI15JNINativeMethod",
    "name" : "JNINativeMethod",
-   "referenced_type" : "type-486",
-   "self_type" : "type-486",
+   "referenced_type" : "_ZTI15JNINativeMethod",
+   "self_type" : "_ZTI15JNINativeMethod",
    "size" : 24,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10957,23 +10661,23 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "name",
      "field_offset" : 64,
-     "referenced_type" : "type-20"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "field_name" : "group",
      "field_offset" : 128,
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI16JavaVMAttachArgs",
    "name" : "JavaVMAttachArgs",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
+   "referenced_type" : "_ZTI16JavaVMAttachArgs",
+   "self_type" : "_ZTI16JavaVMAttachArgs",
    "size" : 24,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10983,48 +10687,48 @@
    [
     {
      "field_name" : "reserved0",
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved1",
      "field_offset" : 64,
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved2",
      "field_offset" : 128,
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "DestroyJavaVM",
      "field_offset" : 192,
-     "referenced_type" : "type-499"
+     "referenced_type" : "_ZTIPFiP7_JavaVME"
     },
     {
      "field_name" : "AttachCurrentThread",
      "field_offset" : 256,
-     "referenced_type" : "type-501"
+     "referenced_type" : "_ZTIPFiP7_JavaVMPP7_JNIEnvPvE"
     },
     {
      "field_name" : "DetachCurrentThread",
      "field_offset" : 320,
-     "referenced_type" : "type-499"
+     "referenced_type" : "_ZTIPFiP7_JavaVME"
     },
     {
      "field_name" : "GetEnv",
      "field_offset" : 384,
-     "referenced_type" : "type-504"
+     "referenced_type" : "_ZTIPFiP7_JavaVMPPviE"
     },
     {
      "field_name" : "AttachCurrentThreadAsDaemon",
      "field_offset" : 448,
-     "referenced_type" : "type-501"
+     "referenced_type" : "_ZTIPFiP7_JavaVMPP7_JNIEnvPvE"
     }
    ],
    "linker_set_key" : "_ZTI18JNIInvokeInterface",
    "name" : "JNIInvokeInterface",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
+   "referenced_type" : "_ZTI18JNIInvokeInterface",
+   "self_type" : "_ZTI18JNIInvokeInterface",
    "size" : 64,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -11034,1173 +10738,1173 @@
    [
     {
      "field_name" : "reserved0",
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved1",
      "field_offset" : 64,
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved2",
      "field_offset" : 128,
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved3",
      "field_offset" : 192,
-     "referenced_type" : "type-11"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "GetVersion",
      "field_offset" : 256,
-     "referenced_type" : "type-13"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvE"
     },
     {
      "field_name" : "DefineClass",
      "field_offset" : 320,
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIPFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE"
     },
     {
      "field_name" : "FindClass",
      "field_offset" : 384,
-     "referenced_type" : "type-26"
+     "referenced_type" : "_ZTIPFP7_jclassP7_JNIEnvPKcE"
     },
     {
      "field_name" : "FromReflectedMethod",
      "field_offset" : 448,
-     "referenced_type" : "type-28"
+     "referenced_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "FromReflectedField",
      "field_offset" : 512,
-     "referenced_type" : "type-32"
+     "referenced_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "ToReflectedMethod",
      "field_offset" : 576,
-     "referenced_type" : "type-36"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE"
     },
     {
      "field_name" : "GetSuperclass",
      "field_offset" : 640,
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIPFP7_jclassP7_JNIEnvS0_E"
     },
     {
      "field_name" : "IsAssignableFrom",
      "field_offset" : 704,
-     "referenced_type" : "type-41"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassS2_E"
     },
     {
      "field_name" : "ToReflectedField",
      "field_offset" : 768,
-     "referenced_type" : "type-43"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE"
     },
     {
      "field_name" : "Throw",
      "field_offset" : 832,
-     "referenced_type" : "type-45"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP11_jthrowableE"
     },
     {
      "field_name" : "ThrowNew",
      "field_offset" : 896,
-     "referenced_type" : "type-49"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassPKcE"
     },
     {
      "field_name" : "ExceptionOccurred",
      "field_offset" : 960,
-     "referenced_type" : "type-51"
+     "referenced_type" : "_ZTIPFP11_jthrowableP7_JNIEnvE"
     },
     {
      "field_name" : "ExceptionDescribe",
      "field_offset" : 1024,
-     "referenced_type" : "type-53"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvE"
     },
     {
      "field_name" : "ExceptionClear",
      "field_offset" : 1088,
-     "referenced_type" : "type-53"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvE"
     },
     {
      "field_name" : "FatalError",
      "field_offset" : 1152,
-     "referenced_type" : "type-55"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvPKcE"
     },
     {
      "field_name" : "PushLocalFrame",
      "field_offset" : 1216,
-     "referenced_type" : "type-57"
+     "referenced_type" : "_ZTIPFiP7_JNIEnviE"
     },
     {
      "field_name" : "PopLocalFrame",
      "field_offset" : 1280,
-     "referenced_type" : "type-59"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E"
     },
     {
      "field_name" : "NewGlobalRef",
      "field_offset" : 1344,
-     "referenced_type" : "type-59"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E"
     },
     {
      "field_name" : "DeleteGlobalRef",
      "field_offset" : 1408,
-     "referenced_type" : "type-61"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "DeleteLocalRef",
      "field_offset" : 1472,
-     "referenced_type" : "type-61"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "IsSameObject",
      "field_offset" : 1536,
-     "referenced_type" : "type-63"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectS2_E"
     },
     {
      "field_name" : "NewLocalRef",
      "field_offset" : 1600,
-     "referenced_type" : "type-59"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E"
     },
     {
      "field_name" : "EnsureLocalCapacity",
      "field_offset" : 1664,
-     "referenced_type" : "type-57"
+     "referenced_type" : "_ZTIPFiP7_JNIEnviE"
     },
     {
      "field_name" : "AllocObject",
      "field_offset" : 1728,
-     "referenced_type" : "type-65"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassE"
     },
     {
      "field_name" : "NewObject",
      "field_offset" : 1792,
-     "referenced_type" : "type-66"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "NewObjectV",
      "field_offset" : 1856,
-     "referenced_type" : "type-68"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "NewObjectA",
      "field_offset" : 1920,
-     "referenced_type" : "type-72"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "GetObjectClass",
      "field_offset" : 1984,
-     "referenced_type" : "type-82"
+     "referenced_type" : "_ZTIPFP7_jclassP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "IsInstanceOf",
      "field_offset" : 2048,
-     "referenced_type" : "type-84"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassE"
     },
     {
      "field_name" : "GetMethodID",
      "field_offset" : 2112,
-     "referenced_type" : "type-86"
+     "referenced_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E"
     },
     {
      "field_name" : "CallObjectMethod",
      "field_offset" : 2176,
-     "referenced_type" : "type-88"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE"
     },
     {
      "field_name" : "CallObjectMethodV",
      "field_offset" : 2240,
-     "referenced_type" : "type-90"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallObjectMethodA",
      "field_offset" : 2304,
-     "referenced_type" : "type-92"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallBooleanMethod",
      "field_offset" : 2368,
-     "referenced_type" : "type-94"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallBooleanMethodV",
      "field_offset" : 2432,
-     "referenced_type" : "type-96"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallBooleanMethodA",
      "field_offset" : 2496,
-     "referenced_type" : "type-98"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallByteMethod",
      "field_offset" : 2560,
-     "referenced_type" : "type-100"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallByteMethodV",
      "field_offset" : 2624,
-     "referenced_type" : "type-102"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallByteMethodA",
      "field_offset" : 2688,
-     "referenced_type" : "type-104"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallCharMethod",
      "field_offset" : 2752,
-     "referenced_type" : "type-106"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallCharMethodV",
      "field_offset" : 2816,
-     "referenced_type" : "type-108"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallCharMethodA",
      "field_offset" : 2880,
-     "referenced_type" : "type-110"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallShortMethod",
      "field_offset" : 2944,
-     "referenced_type" : "type-112"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallShortMethodV",
      "field_offset" : 3008,
-     "referenced_type" : "type-114"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallShortMethodA",
      "field_offset" : 3072,
-     "referenced_type" : "type-116"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallIntMethod",
      "field_offset" : 3136,
-     "referenced_type" : "type-118"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallIntMethodV",
      "field_offset" : 3200,
-     "referenced_type" : "type-120"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallIntMethodA",
      "field_offset" : 3264,
-     "referenced_type" : "type-122"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallLongMethod",
      "field_offset" : 3328,
-     "referenced_type" : "type-124"
+     "referenced_type" : "_ZTIPFlP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallLongMethodV",
      "field_offset" : 3392,
-     "referenced_type" : "type-126"
+     "referenced_type" : "_ZTIPFlP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallLongMethodA",
      "field_offset" : 3456,
-     "referenced_type" : "type-128"
+     "referenced_type" : "_ZTIPFlP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallFloatMethod",
      "field_offset" : 3520,
-     "referenced_type" : "type-130"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallFloatMethodV",
      "field_offset" : 3584,
-     "referenced_type" : "type-132"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallFloatMethodA",
      "field_offset" : 3648,
-     "referenced_type" : "type-134"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallDoubleMethod",
      "field_offset" : 3712,
-     "referenced_type" : "type-136"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallDoubleMethodV",
      "field_offset" : 3776,
-     "referenced_type" : "type-138"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallDoubleMethodA",
      "field_offset" : 3840,
-     "referenced_type" : "type-140"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallVoidMethod",
      "field_offset" : 3904,
-     "referenced_type" : "type-142"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallVoidMethodV",
      "field_offset" : 3968,
-     "referenced_type" : "type-144"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallVoidMethodA",
      "field_offset" : 4032,
-     "referenced_type" : "type-146"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualObjectMethod",
      "field_offset" : 4096,
-     "referenced_type" : "type-148"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualObjectMethodV",
      "field_offset" : 4160,
-     "referenced_type" : "type-150"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallNonvirtualObjectMethodA",
      "field_offset" : 4224,
-     "referenced_type" : "type-152"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualBooleanMethod",
      "field_offset" : 4288,
-     "referenced_type" : "type-154"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualBooleanMethodV",
      "field_offset" : 4352,
-     "referenced_type" : "type-156"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallNonvirtualBooleanMethodA",
      "field_offset" : 4416,
-     "referenced_type" : "type-158"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualByteMethod",
      "field_offset" : 4480,
-     "referenced_type" : "type-160"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualByteMethodV",
      "field_offset" : 4544,
-     "referenced_type" : "type-162"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallNonvirtualByteMethodA",
      "field_offset" : 4608,
-     "referenced_type" : "type-164"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualCharMethod",
      "field_offset" : 4672,
-     "referenced_type" : "type-166"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualCharMethodV",
      "field_offset" : 4736,
-     "referenced_type" : "type-168"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallNonvirtualCharMethodA",
      "field_offset" : 4800,
-     "referenced_type" : "type-170"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualShortMethod",
      "field_offset" : 4864,
-     "referenced_type" : "type-172"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualShortMethodV",
      "field_offset" : 4928,
-     "referenced_type" : "type-174"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallNonvirtualShortMethodA",
      "field_offset" : 4992,
-     "referenced_type" : "type-176"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualIntMethod",
      "field_offset" : 5056,
-     "referenced_type" : "type-178"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualIntMethodV",
      "field_offset" : 5120,
-     "referenced_type" : "type-180"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallNonvirtualIntMethodA",
      "field_offset" : 5184,
-     "referenced_type" : "type-182"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualLongMethod",
      "field_offset" : 5248,
-     "referenced_type" : "type-184"
+     "referenced_type" : "_ZTIPFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualLongMethodV",
      "field_offset" : 5312,
-     "referenced_type" : "type-186"
+     "referenced_type" : "_ZTIPFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallNonvirtualLongMethodA",
      "field_offset" : 5376,
-     "referenced_type" : "type-188"
+     "referenced_type" : "_ZTIPFlP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualFloatMethod",
      "field_offset" : 5440,
-     "referenced_type" : "type-190"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualFloatMethodV",
      "field_offset" : 5504,
-     "referenced_type" : "type-192"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallNonvirtualFloatMethodA",
      "field_offset" : 5568,
-     "referenced_type" : "type-194"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualDoubleMethod",
      "field_offset" : 5632,
-     "referenced_type" : "type-196"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualDoubleMethodV",
      "field_offset" : 5696,
-     "referenced_type" : "type-198"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallNonvirtualDoubleMethodA",
      "field_offset" : 5760,
-     "referenced_type" : "type-200"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualVoidMethod",
      "field_offset" : 5824,
-     "referenced_type" : "type-202"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualVoidMethodV",
      "field_offset" : 5888,
-     "referenced_type" : "type-204"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallNonvirtualVoidMethodA",
      "field_offset" : 5952,
-     "referenced_type" : "type-206"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "GetFieldID",
      "field_offset" : 6016,
-     "referenced_type" : "type-208"
+     "referenced_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E"
     },
     {
      "field_name" : "GetObjectField",
      "field_offset" : 6080,
-     "referenced_type" : "type-210"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE"
     },
     {
      "field_name" : "GetBooleanField",
      "field_offset" : 6144,
-     "referenced_type" : "type-212"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetByteField",
      "field_offset" : 6208,
-     "referenced_type" : "type-214"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetCharField",
      "field_offset" : 6272,
-     "referenced_type" : "type-216"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetShortField",
      "field_offset" : 6336,
-     "referenced_type" : "type-218"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetIntField",
      "field_offset" : 6400,
-     "referenced_type" : "type-220"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetLongField",
      "field_offset" : 6464,
-     "referenced_type" : "type-222"
+     "referenced_type" : "_ZTIPFlP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetFloatField",
      "field_offset" : 6528,
-     "referenced_type" : "type-224"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetDoubleField",
      "field_offset" : 6592,
-     "referenced_type" : "type-226"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "SetObjectField",
      "field_offset" : 6656,
-     "referenced_type" : "type-228"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E"
     },
     {
      "field_name" : "SetBooleanField",
      "field_offset" : 6720,
-     "referenced_type" : "type-230"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDhE"
     },
     {
      "field_name" : "SetByteField",
      "field_offset" : 6784,
-     "referenced_type" : "type-232"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDaE"
     },
     {
      "field_name" : "SetCharField",
      "field_offset" : 6848,
-     "referenced_type" : "type-234"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDtE"
     },
     {
      "field_name" : "SetShortField",
      "field_offset" : 6912,
-     "referenced_type" : "type-236"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDsE"
     },
     {
      "field_name" : "SetIntField",
      "field_offset" : 6976,
-     "referenced_type" : "type-238"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDiE"
     },
     {
      "field_name" : "SetLongField",
      "field_offset" : 7040,
-     "referenced_type" : "type-240"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDlE"
     },
     {
      "field_name" : "SetFloatField",
      "field_offset" : 7104,
-     "referenced_type" : "type-242"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDfE"
     },
     {
      "field_name" : "SetDoubleField",
      "field_offset" : 7168,
-     "referenced_type" : "type-244"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDdE"
     },
     {
      "field_name" : "GetStaticMethodID",
      "field_offset" : 7232,
-     "referenced_type" : "type-86"
+     "referenced_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E"
     },
     {
      "field_name" : "CallStaticObjectMethod",
      "field_offset" : 7296,
-     "referenced_type" : "type-66"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticObjectMethodV",
      "field_offset" : 7360,
-     "referenced_type" : "type-68"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallStaticObjectMethodA",
      "field_offset" : 7424,
-     "referenced_type" : "type-72"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticBooleanMethod",
      "field_offset" : 7488,
-     "referenced_type" : "type-246"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticBooleanMethodV",
      "field_offset" : 7552,
-     "referenced_type" : "type-248"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallStaticBooleanMethodA",
      "field_offset" : 7616,
-     "referenced_type" : "type-250"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticByteMethod",
      "field_offset" : 7680,
-     "referenced_type" : "type-252"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticByteMethodV",
      "field_offset" : 7744,
-     "referenced_type" : "type-254"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallStaticByteMethodA",
      "field_offset" : 7808,
-     "referenced_type" : "type-256"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticCharMethod",
      "field_offset" : 7872,
-     "referenced_type" : "type-258"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticCharMethodV",
      "field_offset" : 7936,
-     "referenced_type" : "type-260"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallStaticCharMethodA",
      "field_offset" : 8000,
-     "referenced_type" : "type-262"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticShortMethod",
      "field_offset" : 8064,
-     "referenced_type" : "type-264"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticShortMethodV",
      "field_offset" : 8128,
-     "referenced_type" : "type-266"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallStaticShortMethodA",
      "field_offset" : 8192,
-     "referenced_type" : "type-268"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticIntMethod",
      "field_offset" : 8256,
-     "referenced_type" : "type-270"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticIntMethodV",
      "field_offset" : 8320,
-     "referenced_type" : "type-272"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallStaticIntMethodA",
      "field_offset" : 8384,
-     "referenced_type" : "type-274"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticLongMethod",
      "field_offset" : 8448,
-     "referenced_type" : "type-276"
+     "referenced_type" : "_ZTIPFlP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticLongMethodV",
      "field_offset" : 8512,
-     "referenced_type" : "type-278"
+     "referenced_type" : "_ZTIPFlP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallStaticLongMethodA",
      "field_offset" : 8576,
-     "referenced_type" : "type-280"
+     "referenced_type" : "_ZTIPFlP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticFloatMethod",
      "field_offset" : 8640,
-     "referenced_type" : "type-282"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticFloatMethodV",
      "field_offset" : 8704,
-     "referenced_type" : "type-284"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallStaticFloatMethodA",
      "field_offset" : 8768,
-     "referenced_type" : "type-286"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticDoubleMethod",
      "field_offset" : 8832,
-     "referenced_type" : "type-288"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticDoubleMethodV",
      "field_offset" : 8896,
-     "referenced_type" : "type-290"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallStaticDoubleMethodA",
      "field_offset" : 8960,
-     "referenced_type" : "type-292"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticVoidMethod",
      "field_offset" : 9024,
-     "referenced_type" : "type-294"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticVoidMethodV",
      "field_offset" : 9088,
-     "referenced_type" : "type-296"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDP13__va_list_tagE"
     },
     {
      "field_name" : "CallStaticVoidMethodA",
      "field_offset" : 9152,
-     "referenced_type" : "type-298"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "GetStaticFieldID",
      "field_offset" : 9216,
-     "referenced_type" : "type-208"
+     "referenced_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E"
     },
     {
      "field_name" : "GetStaticObjectField",
      "field_offset" : 9280,
-     "referenced_type" : "type-300"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticBooleanField",
      "field_offset" : 9344,
-     "referenced_type" : "type-302"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticByteField",
      "field_offset" : 9408,
-     "referenced_type" : "type-304"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticCharField",
      "field_offset" : 9472,
-     "referenced_type" : "type-306"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticShortField",
      "field_offset" : 9536,
-     "referenced_type" : "type-308"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticIntField",
      "field_offset" : 9600,
-     "referenced_type" : "type-310"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticLongField",
      "field_offset" : 9664,
-     "referenced_type" : "type-312"
+     "referenced_type" : "_ZTIPFlP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticFloatField",
      "field_offset" : 9728,
-     "referenced_type" : "type-314"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticDoubleField",
      "field_offset" : 9792,
-     "referenced_type" : "type-316"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "SetStaticObjectField",
      "field_offset" : 9856,
-     "referenced_type" : "type-318"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE"
     },
     {
      "field_name" : "SetStaticBooleanField",
      "field_offset" : 9920,
-     "referenced_type" : "type-320"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDhE"
     },
     {
      "field_name" : "SetStaticByteField",
      "field_offset" : 9984,
-     "referenced_type" : "type-322"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDaE"
     },
     {
      "field_name" : "SetStaticCharField",
      "field_offset" : 10048,
-     "referenced_type" : "type-324"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDtE"
     },
     {
      "field_name" : "SetStaticShortField",
      "field_offset" : 10112,
-     "referenced_type" : "type-326"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDsE"
     },
     {
      "field_name" : "SetStaticIntField",
      "field_offset" : 10176,
-     "referenced_type" : "type-328"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDiE"
     },
     {
      "field_name" : "SetStaticLongField",
      "field_offset" : 10240,
-     "referenced_type" : "type-330"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDlE"
     },
     {
      "field_name" : "SetStaticFloatField",
      "field_offset" : 10304,
-     "referenced_type" : "type-332"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDfE"
     },
     {
      "field_name" : "SetStaticDoubleField",
      "field_offset" : 10368,
-     "referenced_type" : "type-334"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDdE"
     },
     {
      "field_name" : "NewString",
      "field_offset" : 10432,
-     "referenced_type" : "type-336"
+     "referenced_type" : "_ZTIPFP8_jstringP7_JNIEnvPKtiE"
     },
     {
      "field_name" : "GetStringLength",
      "field_offset" : 10496,
-     "referenced_type" : "type-342"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jstringE"
     },
     {
      "field_name" : "GetStringChars",
      "field_offset" : 10560,
-     "referenced_type" : "type-344"
+     "referenced_type" : "_ZTIPFPKtP7_JNIEnvP8_jstringPhE"
     },
     {
      "field_name" : "ReleaseStringChars",
      "field_offset" : 10624,
-     "referenced_type" : "type-347"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKtE"
     },
     {
      "field_name" : "NewStringUTF",
      "field_offset" : 10688,
-     "referenced_type" : "type-349"
+     "referenced_type" : "_ZTIPFP8_jstringP7_JNIEnvPKcE"
     },
     {
      "field_name" : "GetStringUTFLength",
      "field_offset" : 10752,
-     "referenced_type" : "type-342"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jstringE"
     },
     {
      "field_name" : "GetStringUTFChars",
      "field_offset" : 10816,
-     "referenced_type" : "type-351"
+     "referenced_type" : "_ZTIPFPKcP7_JNIEnvP8_jstringPhE"
     },
     {
      "field_name" : "ReleaseStringUTFChars",
      "field_offset" : 10880,
-     "referenced_type" : "type-353"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKcE"
     },
     {
      "field_name" : "GetArrayLength",
      "field_offset" : 10944,
-     "referenced_type" : "type-355"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jarrayE"
     },
     {
      "field_name" : "NewObjectArray",
      "field_offset" : 11008,
-     "referenced_type" : "type-359"
+     "referenced_type" : "_ZTIPFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE"
     },
     {
      "field_name" : "GetObjectArrayElement",
      "field_offset" : 11072,
-     "referenced_type" : "type-363"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP13_jobjectArrayiE"
     },
     {
      "field_name" : "SetObjectArrayElement",
      "field_offset" : 11136,
-     "referenced_type" : "type-365"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE"
     },
     {
      "field_name" : "NewBooleanArray",
      "field_offset" : 11200,
-     "referenced_type" : "type-367"
+     "referenced_type" : "_ZTIPFP14_jbooleanArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewByteArray",
      "field_offset" : 11264,
-     "referenced_type" : "type-371"
+     "referenced_type" : "_ZTIPFP11_jbyteArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewCharArray",
      "field_offset" : 11328,
-     "referenced_type" : "type-375"
+     "referenced_type" : "_ZTIPFP11_jcharArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewShortArray",
      "field_offset" : 11392,
-     "referenced_type" : "type-379"
+     "referenced_type" : "_ZTIPFP12_jshortArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewIntArray",
      "field_offset" : 11456,
-     "referenced_type" : "type-383"
+     "referenced_type" : "_ZTIPFP10_jintArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewLongArray",
      "field_offset" : 11520,
-     "referenced_type" : "type-387"
+     "referenced_type" : "_ZTIPFP11_jlongArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewFloatArray",
      "field_offset" : 11584,
-     "referenced_type" : "type-391"
+     "referenced_type" : "_ZTIPFP12_jfloatArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewDoubleArray",
      "field_offset" : 11648,
-     "referenced_type" : "type-395"
+     "referenced_type" : "_ZTIPFP13_jdoubleArrayP7_JNIEnviE"
     },
     {
      "field_name" : "GetBooleanArrayElements",
      "field_offset" : 11712,
-     "referenced_type" : "type-399"
+     "referenced_type" : "_ZTIPFPhP7_JNIEnvP14_jbooleanArrayS_E"
     },
     {
      "field_name" : "GetByteArrayElements",
      "field_offset" : 11776,
-     "referenced_type" : "type-401"
+     "referenced_type" : "_ZTIPFPaP7_JNIEnvP11_jbyteArrayPhE"
     },
     {
      "field_name" : "GetCharArrayElements",
      "field_offset" : 11840,
-     "referenced_type" : "type-404"
+     "referenced_type" : "_ZTIPFPtP7_JNIEnvP11_jcharArrayPhE"
     },
     {
      "field_name" : "GetShortArrayElements",
      "field_offset" : 11904,
-     "referenced_type" : "type-407"
+     "referenced_type" : "_ZTIPFPsP7_JNIEnvP12_jshortArrayPhE"
     },
     {
      "field_name" : "GetIntArrayElements",
      "field_offset" : 11968,
-     "referenced_type" : "type-410"
+     "referenced_type" : "_ZTIPFPiP7_JNIEnvP10_jintArrayPhE"
     },
     {
      "field_name" : "GetLongArrayElements",
      "field_offset" : 12032,
-     "referenced_type" : "type-413"
+     "referenced_type" : "_ZTIPFPlP7_JNIEnvP11_jlongArrayPhE"
     },
     {
      "field_name" : "GetFloatArrayElements",
      "field_offset" : 12096,
-     "referenced_type" : "type-416"
+     "referenced_type" : "_ZTIPFPfP7_JNIEnvP12_jfloatArrayPhE"
     },
     {
      "field_name" : "GetDoubleArrayElements",
      "field_offset" : 12160,
-     "referenced_type" : "type-419"
+     "referenced_type" : "_ZTIPFPdP7_JNIEnvP13_jdoubleArrayPhE"
     },
     {
      "field_name" : "ReleaseBooleanArrayElements",
      "field_offset" : 12224,
-     "referenced_type" : "type-422"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayPhiE"
     },
     {
      "field_name" : "ReleaseByteArrayElements",
      "field_offset" : 12288,
-     "referenced_type" : "type-424"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayPaiE"
     },
     {
      "field_name" : "ReleaseCharArrayElements",
      "field_offset" : 12352,
-     "referenced_type" : "type-426"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayPtiE"
     },
     {
      "field_name" : "ReleaseShortArrayElements",
      "field_offset" : 12416,
-     "referenced_type" : "type-428"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayPsiE"
     },
     {
      "field_name" : "ReleaseIntArrayElements",
      "field_offset" : 12480,
-     "referenced_type" : "type-430"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayPiiE"
     },
     {
      "field_name" : "ReleaseLongArrayElements",
      "field_offset" : 12544,
-     "referenced_type" : "type-432"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayPliE"
     },
     {
      "field_name" : "ReleaseFloatArrayElements",
      "field_offset" : 12608,
-     "referenced_type" : "type-434"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayPfiE"
     },
     {
      "field_name" : "ReleaseDoubleArrayElements",
      "field_offset" : 12672,
-     "referenced_type" : "type-436"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayPdiE"
     },
     {
      "field_name" : "GetBooleanArrayRegion",
      "field_offset" : 12736,
-     "referenced_type" : "type-438"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPhE"
     },
     {
      "field_name" : "GetByteArrayRegion",
      "field_offset" : 12800,
-     "referenced_type" : "type-440"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPaE"
     },
     {
      "field_name" : "GetCharArrayRegion",
      "field_offset" : 12864,
-     "referenced_type" : "type-442"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPtE"
     },
     {
      "field_name" : "GetShortArrayRegion",
      "field_offset" : 12928,
-     "referenced_type" : "type-444"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPsE"
     },
     {
      "field_name" : "GetIntArrayRegion",
      "field_offset" : 12992,
-     "referenced_type" : "type-446"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPiE"
     },
     {
      "field_name" : "GetLongArrayRegion",
      "field_offset" : 13056,
-     "referenced_type" : "type-448"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPlE"
     },
     {
      "field_name" : "GetFloatArrayRegion",
      "field_offset" : 13120,
-     "referenced_type" : "type-450"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPfE"
     },
     {
      "field_name" : "GetDoubleArrayRegion",
      "field_offset" : 13184,
-     "referenced_type" : "type-452"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPdE"
     },
     {
      "field_name" : "SetBooleanArrayRegion",
      "field_offset" : 13248,
-     "referenced_type" : "type-454"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPKhE"
     },
     {
      "field_name" : "SetByteArrayRegion",
      "field_offset" : 13312,
-     "referenced_type" : "type-458"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPKaE"
     },
     {
      "field_name" : "SetCharArrayRegion",
      "field_offset" : 13376,
-     "referenced_type" : "type-460"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPKtE"
     },
     {
      "field_name" : "SetShortArrayRegion",
      "field_offset" : 13440,
-     "referenced_type" : "type-462"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPKsE"
     },
     {
      "field_name" : "SetIntArrayRegion",
      "field_offset" : 13504,
-     "referenced_type" : "type-466"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPKiE"
     },
     {
      "field_name" : "SetLongArrayRegion",
      "field_offset" : 13568,
-     "referenced_type" : "type-470"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPKlE"
     },
     {
      "field_name" : "SetFloatArrayRegion",
      "field_offset" : 13632,
-     "referenced_type" : "type-474"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPKfE"
     },
     {
      "field_name" : "SetDoubleArrayRegion",
      "field_offset" : 13696,
-     "referenced_type" : "type-478"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPKdE"
     },
     {
      "field_name" : "RegisterNatives",
      "field_offset" : 13760,
-     "referenced_type" : "type-482"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE"
     },
     {
      "field_name" : "UnregisterNatives",
      "field_offset" : 13824,
-     "referenced_type" : "type-487"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassE"
     },
     {
      "field_name" : "MonitorEnter",
      "field_offset" : 13888,
-     "referenced_type" : "type-489"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "MonitorExit",
      "field_offset" : 13952,
-     "referenced_type" : "type-489"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "GetJavaVM",
      "field_offset" : 14016,
-     "referenced_type" : "type-491"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvPP7_JavaVME"
     },
     {
      "field_name" : "GetStringRegion",
      "field_offset" : 14080,
-     "referenced_type" : "type-507"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringiiPtE"
     },
     {
      "field_name" : "GetStringUTFRegion",
      "field_offset" : 14144,
-     "referenced_type" : "type-509"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringiiPcE"
     },
     {
      "field_name" : "GetPrimitiveArrayCritical",
      "field_offset" : 14208,
-     "referenced_type" : "type-512"
+     "referenced_type" : "_ZTIPFPvP7_JNIEnvP7_jarrayPhE"
     },
     {
      "field_name" : "ReleasePrimitiveArrayCritical",
      "field_offset" : 14272,
-     "referenced_type" : "type-514"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jarrayPviE"
     },
     {
      "field_name" : "GetStringCritical",
      "field_offset" : 14336,
-     "referenced_type" : "type-344"
+     "referenced_type" : "_ZTIPFPKtP7_JNIEnvP8_jstringPhE"
     },
     {
      "field_name" : "ReleaseStringCritical",
      "field_offset" : 14400,
-     "referenced_type" : "type-347"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKtE"
     },
     {
      "field_name" : "NewWeakGlobalRef",
      "field_offset" : 14464,
-     "referenced_type" : "type-59"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E"
     },
     {
      "field_name" : "DeleteWeakGlobalRef",
      "field_offset" : 14528,
-     "referenced_type" : "type-61"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "ExceptionCheck",
      "field_offset" : 14592,
-     "referenced_type" : "type-516"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvE"
     },
     {
      "field_name" : "NewDirectByteBuffer",
      "field_offset" : 14656,
-     "referenced_type" : "type-518"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvPvlE"
     },
     {
      "field_name" : "GetDirectBufferAddress",
      "field_offset" : 14720,
-     "referenced_type" : "type-520"
+     "referenced_type" : "_ZTIPFPvP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "GetDirectBufferCapacity",
      "field_offset" : 14784,
-     "referenced_type" : "type-522"
+     "referenced_type" : "_ZTIPFlP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "GetObjectRefType",
      "field_offset" : 14848,
-     "referenced_type" : "type-524"
+     "referenced_type" : "_ZTIPF14jobjectRefTypeP7_JNIEnvP8_jobjectE"
     }
    ],
    "linker_set_key" : "_ZTI18JNINativeInterface",
    "name" : "JNINativeInterface",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
+   "referenced_type" : "_ZTI18JNINativeInterface",
+   "self_type" : "_ZTI18JNINativeInterface",
    "size" : 1864,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12210,46 +11914,46 @@
    [
     {
      "field_name" : "z",
-     "referenced_type" : "type-38"
+     "referenced_type" : "_ZTIh"
     },
     {
      "field_name" : "b",
-     "referenced_type" : "type-25"
+     "referenced_type" : "_ZTIa"
     },
     {
      "field_name" : "c",
-     "referenced_type" : "type-77"
+     "referenced_type" : "_ZTIt"
     },
     {
      "field_name" : "s",
-     "referenced_type" : "type-78"
+     "referenced_type" : "_ZTIs"
     },
     {
      "field_name" : "i",
-     "referenced_type" : "type-15"
+     "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "j",
-     "referenced_type" : "type-79"
+     "referenced_type" : "_ZTIl"
     },
     {
      "field_name" : "f",
-     "referenced_type" : "type-80"
+     "referenced_type" : "_ZTIf"
     },
     {
      "field_name" : "d",
-     "referenced_type" : "type-81"
+     "referenced_type" : "_ZTId"
     },
     {
      "field_name" : "l",
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI6jvalue",
    "name" : "jvalue",
    "record_kind" : "union",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "_ZTI6jvalue",
+   "self_type" : "_ZTI6jvalue",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12259,13 +11963,13 @@
    [
     {
      "field_name" : "functions",
-     "referenced_type" : "type-8"
+     "referenced_type" : "_ZTIPK18JNINativeInterface"
     }
    ],
    "linker_set_key" : "_ZTI7_JNIEnv",
    "name" : "_JNIEnv",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
+   "referenced_type" : "_ZTI7_JNIEnv",
+   "self_type" : "_ZTI7_JNIEnv",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12275,13 +11979,13 @@
    [
     {
      "field_name" : "functions",
-     "referenced_type" : "type-496"
+     "referenced_type" : "_ZTIPK18JNIInvokeInterface"
     }
    ],
    "linker_set_key" : "_ZTI7_JavaVM",
    "name" : "_JavaVM",
-   "referenced_type" : "type-495",
-   "self_type" : "type-495",
+   "referenced_type" : "_ZTI7_JavaVM",
+   "self_type" : "_ZTI7_JavaVM",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12290,14 +11994,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTI8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI7_jarray",
    "name" : "_jarray",
    "record_kind" : "class",
-   "referenced_type" : "type-358",
-   "self_type" : "type-358",
+   "referenced_type" : "_ZTI7_jarray",
+   "self_type" : "_ZTI7_jarray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12306,14 +12010,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTI8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI7_jclass",
    "name" : "_jclass",
    "record_kind" : "class",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "_ZTI7_jclass",
+   "self_type" : "_ZTI7_jclass",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12322,8 +12026,8 @@
    "linker_set_key" : "_ZTI8_jobject",
    "name" : "_jobject",
    "record_kind" : "class",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
+   "referenced_type" : "_ZTI8_jobject",
+   "self_type" : "_ZTI8_jobject",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12332,14 +12036,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTI8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI8_jstring",
    "name" : "_jstring",
    "record_kind" : "class",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
+   "referenced_type" : "_ZTI8_jstring",
+   "self_type" : "_ZTI8_jstring",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   }
diff --git a/R/64/x86_x86_64/source-based/libbinder_ndk.so.lsdump b/R/64/x86_x86_64/source-based/libbinder_ndk.so.lsdump
index 2937bb9..cf28f66 100644
--- a/R/64/x86_x86_64/source-based/libbinder_ndk.so.lsdump
+++ b/R/64/x86_x86_64/source-based/libbinder_ndk.so.lsdump
@@ -8,8 +8,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIDs",
    "name" : "char16_t",
-   "referenced_type" : "type-602",
-   "self_type" : "type-602",
+   "referenced_type" : "_ZTIDs",
+   "self_type" : "_ZTIDs",
    "size" : 2
   },
   {
@@ -17,8 +17,8 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIa",
    "name" : "signed char",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
+   "referenced_type" : "_ZTIa",
+   "self_type" : "_ZTIa",
    "size" : 1
   },
   {
@@ -27,8 +27,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIb",
    "name" : "bool",
-   "referenced_type" : "type-556",
-   "self_type" : "type-556",
+   "referenced_type" : "_ZTIb",
+   "self_type" : "_ZTIb",
    "size" : 1
   },
   {
@@ -36,24 +36,24 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIc",
    "name" : "char",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIc",
    "size" : 1
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTId",
    "name" : "double",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
+   "referenced_type" : "_ZTId",
+   "self_type" : "_ZTId",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIf",
    "name" : "float",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
+   "referenced_type" : "_ZTIf",
+   "self_type" : "_ZTIf",
    "size" : 4
   },
   {
@@ -62,8 +62,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIh",
    "name" : "unsigned char",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIh",
    "size" : 1
   },
   {
@@ -71,8 +71,8 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIi",
    "name" : "int",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
+   "referenced_type" : "_ZTIi",
+   "self_type" : "_ZTIi",
    "size" : 4
   },
   {
@@ -81,8 +81,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIj",
    "name" : "unsigned int",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
+   "referenced_type" : "_ZTIj",
+   "self_type" : "_ZTIj",
    "size" : 4
   },
   {
@@ -90,8 +90,8 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIs",
    "name" : "short",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "_ZTIs",
+   "self_type" : "_ZTIs",
    "size" : 2
   },
   {
@@ -100,23 +100,23 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIt",
    "name" : "unsigned short",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "_ZTIt",
+   "self_type" : "_ZTIt",
    "size" : 2
   },
   {
    "linker_set_key" : "_ZTIv",
    "name" : "void",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13"
+   "referenced_type" : "_ZTIv",
+   "self_type" : "_ZTIv"
   },
   {
    "alignment" : 4,
    "is_integral" : true,
    "linker_set_key" : "_ZTIx",
    "name" : "long long",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
+   "referenced_type" : "_ZTIx",
+   "self_type" : "_ZTIx",
    "size" : 8
   },
   {
@@ -125,8 +125,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIy",
    "name" : "unsigned long long",
-   "referenced_type" : "type-601",
-   "self_type" : "type-601",
+   "referenced_type" : "_ZTIy",
+   "self_type" : "_ZTIy",
    "size" : 8
   }
  ],
@@ -466,11 +466,11 @@
    ],
    "linker_set_key" : "_ZTI14jobjectRefType",
    "name" : "jobjectRefType",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
+   "referenced_type" : "_ZTI14jobjectRefType",
+   "self_type" : "_ZTI14jobjectRefType",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h",
-   "underlying_type" : "type-525"
+   "underlying_type" : "_ZTIj"
   }
  ],
  "function_types" :
@@ -482,15 +482,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-523",
-   "return_type" : "type-524",
-   "self_type" : "type-523",
+   "referenced_type" : "_ZTIF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTI14jobjectRefType",
+   "self_type" : "_ZTIF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -500,15 +500,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-383",
-   "return_type" : "type-384",
-   "self_type" : "type-383",
+   "referenced_type" : "_ZTIFP10_jintArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP10_jintArray",
+   "self_type" : "_ZTIFP10_jintArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -518,21 +518,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-86",
-   "return_type" : "type-31",
-   "self_type" : "type-86",
+   "referenced_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
+   "return_type" : "_ZTIP10_jmethodID",
+   "self_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -542,15 +542,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-30",
-   "return_type" : "type-31",
-   "self_type" : "type-30",
+   "referenced_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIP10_jmethodID",
+   "self_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -560,15 +560,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-371",
-   "return_type" : "type-372",
-   "self_type" : "type-371",
+   "referenced_type" : "_ZTIFP11_jbyteArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP11_jbyteArray",
+   "self_type" : "_ZTIFP11_jbyteArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -578,15 +578,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-375",
-   "return_type" : "type-376",
-   "self_type" : "type-375",
+   "referenced_type" : "_ZTIFP11_jcharArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP11_jcharArray",
+   "self_type" : "_ZTIFP11_jcharArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -596,15 +596,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-387",
-   "return_type" : "type-388",
-   "self_type" : "type-387",
+   "referenced_type" : "_ZTIFP11_jlongArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP11_jlongArray",
+   "self_type" : "_ZTIFP11_jlongArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -614,12 +614,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     }
    ],
-   "referenced_type" : "type-53",
-   "return_type" : "type-48",
-   "self_type" : "type-53",
+   "referenced_type" : "_ZTIFP11_jthrowableP7_JNIEnvE",
+   "return_type" : "_ZTIP11_jthrowable",
+   "self_type" : "_ZTIFP11_jthrowableP7_JNIEnvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -629,15 +629,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-391",
-   "return_type" : "type-392",
-   "self_type" : "type-391",
+   "referenced_type" : "_ZTIFP12_jfloatArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP12_jfloatArray",
+   "self_type" : "_ZTIFP12_jfloatArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -647,15 +647,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-379",
-   "return_type" : "type-380",
-   "self_type" : "type-379",
+   "referenced_type" : "_ZTIFP12_jshortArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP12_jshortArray",
+   "self_type" : "_ZTIFP12_jshortArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -665,15 +665,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-395",
-   "return_type" : "type-396",
-   "self_type" : "type-395",
+   "referenced_type" : "_ZTIFP13_jdoubleArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP13_jdoubleArray",
+   "self_type" : "_ZTIFP13_jdoubleArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -683,21 +683,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-359",
-   "return_type" : "type-360",
-   "self_type" : "type-359",
+   "referenced_type" : "_ZTIFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
+   "return_type" : "_ZTIP13_jobjectArray",
+   "self_type" : "_ZTIFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -707,15 +707,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-367",
-   "return_type" : "type-368",
-   "self_type" : "type-367",
+   "referenced_type" : "_ZTIFP14_jbooleanArrayP7_JNIEnviE",
+   "return_type" : "_ZTIP14_jbooleanArray",
+   "self_type" : "_ZTIFP14_jbooleanArrayP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -725,15 +725,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-82",
-   "return_type" : "type-19",
-   "self_type" : "type-82",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIP7_jclass",
+   "self_type" : "_ZTIFP7_jclassP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -743,15 +743,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-28",
-   "return_type" : "type-19",
-   "self_type" : "type-28",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvPKcE",
+   "return_type" : "_ZTIP7_jclass",
+   "self_type" : "_ZTIFP7_jclassP7_JNIEnvPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -761,24 +761,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "_ZTIPKa"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-18",
-   "return_type" : "type-19",
-   "self_type" : "type-18",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
+   "return_type" : "_ZTIP7_jclass",
+   "self_type" : "_ZTIFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -788,15 +788,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-41",
-   "return_type" : "type-19",
-   "self_type" : "type-41",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvS0_E",
+   "return_type" : "_ZTIP7_jclass",
+   "self_type" : "_ZTIFP7_jclassP7_JNIEnvS0_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -806,18 +806,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-360"
+     "referenced_type" : "_ZTIP13_jobjectArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-363",
-   "return_type" : "type-5",
-   "self_type" : "type-363",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -827,15 +827,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-4",
-   "return_type" : "type-5",
-   "self_type" : "type-4",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -845,21 +845,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-72",
-   "return_type" : "type-5",
-   "self_type" : "type-72",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -869,21 +869,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-69",
-   "return_type" : "type-5",
-   "self_type" : "type-69",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -893,21 +893,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     }
    ],
-   "referenced_type" : "type-38",
-   "return_type" : "type-5",
-   "self_type" : "type-38",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -917,18 +917,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-67",
-   "return_type" : "type-5",
-   "self_type" : "type-67",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -938,18 +938,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-300",
-   "return_type" : "type-5",
-   "self_type" : "type-300",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -959,21 +959,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     }
    ],
-   "referenced_type" : "type-45",
-   "return_type" : "type-5",
-   "self_type" : "type-45",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -983,18 +983,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "_ZTIx"
     }
    ],
-   "referenced_type" : "type-517",
-   "return_type" : "type-5",
-   "self_type" : "type-517",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvPvxE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvPvxE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1004,15 +1004,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-61",
-   "return_type" : "type-5",
-   "self_type" : "type-61",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_E",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1022,21 +1022,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-92",
-   "return_type" : "type-5",
-   "self_type" : "type-92",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1046,21 +1046,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-90",
-   "return_type" : "type-5",
-   "self_type" : "type-90",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPcE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1070,18 +1070,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-88",
-   "return_type" : "type-5",
-   "self_type" : "type-88",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1091,24 +1091,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-152",
-   "return_type" : "type-5",
-   "self_type" : "type-152",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1118,24 +1118,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-150",
-   "return_type" : "type-5",
-   "self_type" : "type-150",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1145,21 +1145,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-148",
-   "return_type" : "type-5",
-   "self_type" : "type-148",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1169,18 +1169,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-210",
-   "return_type" : "type-5",
-   "self_type" : "type-210",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
+   "return_type" : "_ZTIP8_jobject",
+   "self_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1190,15 +1190,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-349",
-   "return_type" : "type-337",
-   "self_type" : "type-349",
+   "referenced_type" : "_ZTIFP8_jstringP7_JNIEnvPKcE",
+   "return_type" : "_ZTIP8_jstring",
+   "self_type" : "_ZTIFP8_jstringP7_JNIEnvPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1208,18 +1208,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-339"
+     "referenced_type" : "_ZTIPKt"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-336",
-   "return_type" : "type-337",
-   "self_type" : "type-336",
+   "referenced_type" : "_ZTIFP8_jstringP7_JNIEnvPKtiE",
+   "return_type" : "_ZTIP8_jstring",
+   "self_type" : "_ZTIFP8_jstringP7_JNIEnvPKtiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1229,21 +1229,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-208",
-   "return_type" : "type-35",
-   "self_type" : "type-208",
+   "referenced_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
+   "return_type" : "_ZTIP9_jfieldID",
+   "self_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1253,15 +1253,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-34",
-   "return_type" : "type-35",
-   "self_type" : "type-34",
+   "referenced_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIP9_jfieldID",
+   "self_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1271,18 +1271,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-337"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-351",
-   "return_type" : "type-21",
-   "self_type" : "type-351",
+   "referenced_type" : "_ZTIFPKcP7_JNIEnvP8_jstringPhE",
+   "return_type" : "_ZTIPKc",
+   "self_type" : "_ZTIFPKcP7_JNIEnvP8_jstringPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1292,18 +1292,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-585"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-525"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "_ZTIPi"
     }
    ],
-   "referenced_type" : "type-586",
-   "return_type" : "type-21",
-   "self_type" : "type-586",
+   "referenced_type" : "_ZTIFPKcPKvjPiE",
+   "return_type" : "_ZTIPKc",
+   "self_type" : "_ZTIFPKcPKvjPiE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1313,18 +1313,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-337"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-344",
-   "return_type" : "type-339",
-   "self_type" : "type-344",
+   "referenced_type" : "_ZTIFPKtP7_JNIEnvP8_jstringPhE",
+   "return_type" : "_ZTIPKt",
+   "self_type" : "_ZTIFPKtP7_JNIEnvP8_jstringPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1334,18 +1334,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-372"
+     "referenced_type" : "_ZTIP11_jbyteArray"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-401",
-   "return_type" : "type-402",
-   "self_type" : "type-401",
+   "referenced_type" : "_ZTIFPaP7_JNIEnvP11_jbyteArrayPhE",
+   "return_type" : "_ZTIPa",
+   "self_type" : "_ZTIFPaP7_JNIEnvP11_jbyteArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1355,18 +1355,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-396"
+     "referenced_type" : "_ZTIP13_jdoubleArray"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-419",
-   "return_type" : "type-420",
-   "self_type" : "type-419",
+   "referenced_type" : "_ZTIFPdP7_JNIEnvP13_jdoubleArrayPhE",
+   "return_type" : "_ZTIPd",
+   "self_type" : "_ZTIFPdP7_JNIEnvP13_jdoubleArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1376,18 +1376,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-392"
+     "referenced_type" : "_ZTIP12_jfloatArray"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-416",
-   "return_type" : "type-417",
-   "self_type" : "type-416",
+   "referenced_type" : "_ZTIFPfP7_JNIEnvP12_jfloatArrayPhE",
+   "return_type" : "_ZTIPf",
+   "self_type" : "_ZTIFPfP7_JNIEnvP12_jfloatArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1397,18 +1397,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "_ZTIP14_jbooleanArray"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-399",
-   "return_type" : "type-345",
-   "self_type" : "type-399",
+   "referenced_type" : "_ZTIFPhP7_JNIEnvP14_jbooleanArrayS_E",
+   "return_type" : "_ZTIPh",
+   "self_type" : "_ZTIFPhP7_JNIEnvP14_jbooleanArrayS_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1418,18 +1418,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-384"
+     "referenced_type" : "_ZTIP10_jintArray"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-410",
-   "return_type" : "type-411",
-   "self_type" : "type-410",
+   "referenced_type" : "_ZTIFPiP7_JNIEnvP10_jintArrayPhE",
+   "return_type" : "_ZTIPi",
+   "self_type" : "_ZTIFPiP7_JNIEnvP10_jintArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1439,18 +1439,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-380"
+     "referenced_type" : "_ZTIP12_jshortArray"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-407",
-   "return_type" : "type-408",
-   "self_type" : "type-407",
+   "referenced_type" : "_ZTIFPsP7_JNIEnvP12_jshortArrayPhE",
+   "return_type" : "_ZTIPs",
+   "self_type" : "_ZTIFPsP7_JNIEnvP12_jshortArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1460,18 +1460,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-376"
+     "referenced_type" : "_ZTIP11_jcharArray"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-404",
-   "return_type" : "type-405",
-   "self_type" : "type-404",
+   "referenced_type" : "_ZTIFPtP7_JNIEnvP11_jcharArrayPhE",
+   "return_type" : "_ZTIPt",
+   "self_type" : "_ZTIFPtP7_JNIEnvP11_jcharArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1481,18 +1481,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-356"
+     "referenced_type" : "_ZTIP7_jarray"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-511",
-   "return_type" : "type-12",
-   "self_type" : "type-511",
+   "referenced_type" : "_ZTIFPvP7_JNIEnvP7_jarrayPhE",
+   "return_type" : "_ZTIPv",
+   "self_type" : "_ZTIFPvP7_JNIEnvP7_jarrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1502,15 +1502,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-519",
-   "return_type" : "type-12",
-   "self_type" : "type-519",
+   "referenced_type" : "_ZTIFPvP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIPv",
+   "self_type" : "_ZTIFPvP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1520,12 +1520,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "referenced_type" : "type-567",
-   "return_type" : "type-12",
-   "self_type" : "type-567",
+   "referenced_type" : "_ZTIFPvS_E",
+   "return_type" : "_ZTIPv",
+   "self_type" : "_ZTIFPvS_E",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -1535,18 +1535,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-388"
+     "referenced_type" : "_ZTIP11_jlongArray"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-413",
-   "return_type" : "type-414",
-   "self_type" : "type-413",
+   "referenced_type" : "_ZTIFPxP7_JNIEnvP11_jlongArrayPhE",
+   "return_type" : "_ZTIPx",
+   "self_type" : "_ZTIFPxP7_JNIEnvP11_jlongArrayPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1556,21 +1556,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-256",
-   "return_type" : "type-26",
-   "self_type" : "type-256",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1580,21 +1580,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-254",
-   "return_type" : "type-26",
-   "self_type" : "type-254",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1604,18 +1604,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-252",
-   "return_type" : "type-26",
-   "self_type" : "type-252",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1625,18 +1625,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-304",
-   "return_type" : "type-26",
-   "self_type" : "type-304",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1646,21 +1646,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-104",
-   "return_type" : "type-26",
-   "self_type" : "type-104",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1670,21 +1670,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-102",
-   "return_type" : "type-26",
-   "self_type" : "type-102",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1694,18 +1694,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-100",
-   "return_type" : "type-26",
-   "self_type" : "type-100",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1715,24 +1715,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-164",
-   "return_type" : "type-26",
-   "self_type" : "type-164",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1742,24 +1742,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-162",
-   "return_type" : "type-26",
-   "self_type" : "type-162",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1769,21 +1769,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-160",
-   "return_type" : "type-26",
-   "self_type" : "type-160",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1793,18 +1793,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-214",
-   "return_type" : "type-26",
-   "self_type" : "type-214",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIa",
+   "self_type" : "_ZTIFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -1814,15 +1814,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-585"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-525"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "referenced_type" : "type-612",
-   "return_type" : "type-556",
-   "self_type" : "type-612",
+   "referenced_type" : "_ZTIFbPKvjE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPKvjE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1832,15 +1832,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-590",
-   "return_type" : "type-556",
-   "self_type" : "type-590",
+   "referenced_type" : "_ZTIFbPviE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1850,18 +1850,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-640"
+     "referenced_type" : "_ZTIPPDs"
     }
    ],
-   "referenced_type" : "type-639",
-   "return_type" : "type-556",
-   "self_type" : "type-639",
+   "referenced_type" : "_ZTIFbPviPPDsE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPDsE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1871,18 +1871,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-643"
+     "referenced_type" : "_ZTIPPa"
     }
    ],
-   "referenced_type" : "type-642",
-   "return_type" : "type-556",
-   "self_type" : "type-642",
+   "referenced_type" : "_ZTIFbPviPPaE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPaE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1892,18 +1892,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-582"
+     "referenced_type" : "_ZTIPPc"
     }
    ],
-   "referenced_type" : "type-581",
-   "return_type" : "type-556",
-   "self_type" : "type-581",
+   "referenced_type" : "_ZTIFbPviPPcE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPcE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1913,18 +1913,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-634"
+     "referenced_type" : "_ZTIPPd"
     }
    ],
-   "referenced_type" : "type-633",
-   "return_type" : "type-556",
-   "self_type" : "type-633",
+   "referenced_type" : "_ZTIFbPviPPdE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPdE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1934,18 +1934,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-631"
+     "referenced_type" : "_ZTIPPf"
     }
    ],
-   "referenced_type" : "type-630",
-   "return_type" : "type-556",
-   "self_type" : "type-630",
+   "referenced_type" : "_ZTIFbPviPPfE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPfE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1955,18 +1955,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-617"
+     "referenced_type" : "_ZTIPPi"
     }
    ],
-   "referenced_type" : "type-616",
-   "return_type" : "type-556",
-   "self_type" : "type-616",
+   "referenced_type" : "_ZTIFbPviPPiE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPiE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1976,18 +1976,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-620"
+     "referenced_type" : "_ZTIPPj"
     }
    ],
-   "referenced_type" : "type-619",
-   "return_type" : "type-556",
-   "self_type" : "type-619",
+   "referenced_type" : "_ZTIFbPviPPjE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPjE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -1997,18 +1997,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-623"
+     "referenced_type" : "_ZTIPPx"
     }
    ],
-   "referenced_type" : "type-622",
-   "return_type" : "type-556",
-   "self_type" : "type-622",
+   "referenced_type" : "_ZTIFbPviPPxE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPxE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -2018,18 +2018,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-626"
+     "referenced_type" : "_ZTIPPy"
     }
    ],
-   "referenced_type" : "type-625",
-   "return_type" : "type-556",
-   "self_type" : "type-625",
+   "referenced_type" : "_ZTIFbPviPPyE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPviPPyE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -2039,21 +2039,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-525"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-582"
+     "referenced_type" : "_ZTIPPc"
     }
    ],
-   "referenced_type" : "type-592",
-   "return_type" : "type-556",
-   "self_type" : "type-592",
+   "referenced_type" : "_ZTIFbPvjiPPcE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPvjiPPcE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -2063,21 +2063,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-292",
-   "return_type" : "type-80",
-   "self_type" : "type-292",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2087,21 +2087,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-290",
-   "return_type" : "type-80",
-   "self_type" : "type-290",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2111,18 +2111,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-288",
-   "return_type" : "type-80",
-   "self_type" : "type-288",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2132,18 +2132,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-316",
-   "return_type" : "type-80",
-   "self_type" : "type-316",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2153,21 +2153,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-140",
-   "return_type" : "type-80",
-   "self_type" : "type-140",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2177,21 +2177,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-138",
-   "return_type" : "type-80",
-   "self_type" : "type-138",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2201,18 +2201,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-136",
-   "return_type" : "type-80",
-   "self_type" : "type-136",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2222,24 +2222,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-200",
-   "return_type" : "type-80",
-   "self_type" : "type-200",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2249,24 +2249,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-198",
-   "return_type" : "type-80",
-   "self_type" : "type-198",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2276,21 +2276,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-196",
-   "return_type" : "type-80",
-   "self_type" : "type-196",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2300,18 +2300,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-226",
-   "return_type" : "type-80",
-   "self_type" : "type-226",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTId",
+   "self_type" : "_ZTIFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2321,21 +2321,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-286",
-   "return_type" : "type-79",
-   "self_type" : "type-286",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2345,21 +2345,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-284",
-   "return_type" : "type-79",
-   "self_type" : "type-284",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2369,18 +2369,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-282",
-   "return_type" : "type-79",
-   "self_type" : "type-282",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2390,18 +2390,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-314",
-   "return_type" : "type-79",
-   "self_type" : "type-314",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2411,21 +2411,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-134",
-   "return_type" : "type-79",
-   "self_type" : "type-134",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2435,21 +2435,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-132",
-   "return_type" : "type-79",
-   "self_type" : "type-132",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2459,18 +2459,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-130",
-   "return_type" : "type-79",
-   "self_type" : "type-130",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2480,24 +2480,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-194",
-   "return_type" : "type-79",
-   "self_type" : "type-194",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2507,24 +2507,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-192",
-   "return_type" : "type-79",
-   "self_type" : "type-192",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2534,21 +2534,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-190",
-   "return_type" : "type-79",
-   "self_type" : "type-190",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2558,18 +2558,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-224",
-   "return_type" : "type-79",
-   "self_type" : "type-224",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIf",
+   "self_type" : "_ZTIFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2579,12 +2579,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     }
    ],
-   "referenced_type" : "type-515",
-   "return_type" : "type-39",
-   "self_type" : "type-515",
+   "referenced_type" : "_ZTIFhP7_JNIEnvE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2594,21 +2594,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-250",
-   "return_type" : "type-39",
-   "self_type" : "type-250",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2618,21 +2618,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-248",
-   "return_type" : "type-39",
-   "self_type" : "type-248",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2642,18 +2642,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-246",
-   "return_type" : "type-39",
-   "self_type" : "type-246",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2663,18 +2663,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-302",
-   "return_type" : "type-39",
-   "self_type" : "type-302",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2684,18 +2684,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-43",
-   "return_type" : "type-39",
-   "self_type" : "type-43",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassS2_E",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP7_jclassS2_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2705,21 +2705,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-98",
-   "return_type" : "type-39",
-   "self_type" : "type-98",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2729,21 +2729,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-96",
-   "return_type" : "type-39",
-   "self_type" : "type-96",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2753,18 +2753,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-94",
-   "return_type" : "type-39",
-   "self_type" : "type-94",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2774,18 +2774,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-84",
-   "return_type" : "type-39",
-   "self_type" : "type-84",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2795,24 +2795,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-158",
-   "return_type" : "type-39",
-   "self_type" : "type-158",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2822,24 +2822,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-156",
-   "return_type" : "type-39",
-   "self_type" : "type-156",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2849,21 +2849,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-154",
-   "return_type" : "type-39",
-   "self_type" : "type-154",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2873,18 +2873,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-212",
-   "return_type" : "type-39",
-   "self_type" : "type-212",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2894,18 +2894,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-65",
-   "return_type" : "type-39",
-   "self_type" : "type-65",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectS2_E",
+   "return_type" : "_ZTIh",
+   "self_type" : "_ZTIFhP7_JNIEnvP8_jobjectS2_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2915,18 +2915,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-585"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-525"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "referenced_type" : "type-594",
-   "return_type" : "type-16",
-   "self_type" : "type-594",
+   "referenced_type" : "_ZTIFiP7AParcelPKvjE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7AParcelPKvjE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -2936,12 +2936,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     }
    ],
-   "referenced_type" : "type-15",
-   "return_type" : "type-16",
-   "self_type" : "type-15",
+   "referenced_type" : "_ZTIFiP7_JNIEnvE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2951,15 +2951,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "_ZTIP11_jthrowable"
     }
    ],
-   "referenced_type" : "type-47",
-   "return_type" : "type-16",
-   "self_type" : "type-47",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP11_jthrowableE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP11_jthrowableE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2969,15 +2969,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-356"
+     "referenced_type" : "_ZTIP7_jarray"
     }
    ],
-   "referenced_type" : "type-355",
-   "return_type" : "type-16",
-   "self_type" : "type-355",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jarrayE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jarrayE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -2987,15 +2987,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     }
    ],
-   "referenced_type" : "type-487",
-   "return_type" : "type-16",
-   "self_type" : "type-487",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3005,21 +3005,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-274",
-   "return_type" : "type-16",
-   "self_type" : "type-274",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3029,21 +3029,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-272",
-   "return_type" : "type-16",
-   "self_type" : "type-272",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3053,18 +3053,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-270",
-   "return_type" : "type-16",
-   "self_type" : "type-270",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3074,18 +3074,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-310",
-   "return_type" : "type-16",
-   "self_type" : "type-310",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3095,21 +3095,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-483"
+     "referenced_type" : "_ZTIPK15JNINativeMethod"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-482",
-   "return_type" : "type-16",
-   "self_type" : "type-482",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3119,18 +3119,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-51",
-   "return_type" : "type-16",
-   "self_type" : "type-51",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassPKcE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP7_jclassPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3140,15 +3140,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-489",
-   "return_type" : "type-16",
-   "self_type" : "type-489",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3158,21 +3158,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-122",
-   "return_type" : "type-16",
-   "self_type" : "type-122",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3182,21 +3182,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-120",
-   "return_type" : "type-16",
-   "self_type" : "type-120",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3206,18 +3206,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-118",
-   "return_type" : "type-16",
-   "self_type" : "type-118",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3227,24 +3227,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-182",
-   "return_type" : "type-16",
-   "self_type" : "type-182",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3254,24 +3254,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-180",
-   "return_type" : "type-16",
-   "self_type" : "type-180",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3281,21 +3281,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-178",
-   "return_type" : "type-16",
-   "self_type" : "type-178",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3305,18 +3305,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-220",
-   "return_type" : "type-16",
-   "self_type" : "type-220",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3326,15 +3326,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-337"
+     "referenced_type" : "_ZTIP8_jstring"
     }
    ],
-   "referenced_type" : "type-342",
-   "return_type" : "type-16",
-   "self_type" : "type-342",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jstringE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvP8_jstringE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3344,15 +3344,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-492"
+     "referenced_type" : "_ZTIPP7_JavaVM"
     }
    ],
-   "referenced_type" : "type-491",
-   "return_type" : "type-16",
-   "self_type" : "type-491",
+   "referenced_type" : "_ZTIFiP7_JNIEnvPP7_JavaVME",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnvPP7_JavaVME",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3362,15 +3362,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-59",
-   "return_type" : "type-16",
-   "self_type" : "type-59",
+   "referenced_type" : "_ZTIFiP7_JNIEnviE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JNIEnviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3380,12 +3380,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-493"
+     "referenced_type" : "_ZTIP7_JavaVM"
     }
    ],
-   "referenced_type" : "type-499",
-   "return_type" : "type-16",
-   "self_type" : "type-499",
+   "referenced_type" : "_ZTIFiP7_JavaVME",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JavaVME",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3395,18 +3395,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-493"
+     "referenced_type" : "_ZTIP7_JavaVM"
     },
     {
-     "referenced_type" : "type-502"
+     "referenced_type" : "_ZTIPP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "referenced_type" : "type-501",
-   "return_type" : "type-16",
-   "self_type" : "type-501",
+   "referenced_type" : "_ZTIFiP7_JavaVMPP7_JNIEnvPvE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JavaVMPP7_JNIEnvPvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3416,18 +3416,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-493"
+     "referenced_type" : "_ZTIP7_JavaVM"
     },
     {
-     "referenced_type" : "type-505"
+     "referenced_type" : "_ZTIPPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-504",
-   "return_type" : "type-16",
-   "self_type" : "type-504",
+   "referenced_type" : "_ZTIFiP7_JavaVMPPviE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP7_JavaVMPPviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3437,21 +3437,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-551"
+     "referenced_type" : "_ZTIPPKc"
     },
     {
-     "referenced_type" : "type-525"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "referenced_type" : "type-550",
-   "return_type" : "type-16",
-   "self_type" : "type-550",
+   "referenced_type" : "_ZTIFiP8AIBinderiPPKcjE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP8AIBinderiPPKcjE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -3461,21 +3461,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-525"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-541"
+     "referenced_type" : "_ZTIPK7AParcel"
     },
     {
-     "referenced_type" : "type-544"
+     "referenced_type" : "_ZTIP7AParcel"
     }
    ],
-   "referenced_type" : "type-547",
-   "return_type" : "type-16",
-   "self_type" : "type-547",
+   "referenced_type" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -3485,18 +3485,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-525"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "referenced_type" : "type-596",
-   "return_type" : "type-16",
-   "self_type" : "type-596",
+   "referenced_type" : "_ZTIFiPK7AParcelPvjE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiPK7AParcelPvjE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -3506,21 +3506,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-268",
-   "return_type" : "type-77",
-   "self_type" : "type-268",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3530,21 +3530,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-266",
-   "return_type" : "type-77",
-   "self_type" : "type-266",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3554,18 +3554,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-264",
-   "return_type" : "type-77",
-   "self_type" : "type-264",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3575,18 +3575,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-308",
-   "return_type" : "type-77",
-   "self_type" : "type-308",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3596,21 +3596,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-116",
-   "return_type" : "type-77",
-   "self_type" : "type-116",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3620,21 +3620,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-114",
-   "return_type" : "type-77",
-   "self_type" : "type-114",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3644,18 +3644,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-112",
-   "return_type" : "type-77",
-   "self_type" : "type-112",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3665,24 +3665,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-176",
-   "return_type" : "type-77",
-   "self_type" : "type-176",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3692,24 +3692,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-174",
-   "return_type" : "type-77",
-   "self_type" : "type-174",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3719,21 +3719,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-172",
-   "return_type" : "type-77",
-   "self_type" : "type-172",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3743,18 +3743,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-218",
-   "return_type" : "type-77",
-   "self_type" : "type-218",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIs",
+   "self_type" : "_ZTIFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3764,21 +3764,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-262",
-   "return_type" : "type-76",
-   "self_type" : "type-262",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3788,21 +3788,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-260",
-   "return_type" : "type-76",
-   "self_type" : "type-260",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3812,18 +3812,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-258",
-   "return_type" : "type-76",
-   "self_type" : "type-258",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3833,18 +3833,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-306",
-   "return_type" : "type-76",
-   "self_type" : "type-306",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3854,21 +3854,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-110",
-   "return_type" : "type-76",
-   "self_type" : "type-110",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3878,21 +3878,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-108",
-   "return_type" : "type-76",
-   "self_type" : "type-108",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3902,18 +3902,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-106",
-   "return_type" : "type-76",
-   "self_type" : "type-106",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3923,24 +3923,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-170",
-   "return_type" : "type-76",
-   "self_type" : "type-170",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3950,24 +3950,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-168",
-   "return_type" : "type-76",
-   "self_type" : "type-168",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -3977,21 +3977,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-166",
-   "return_type" : "type-76",
-   "self_type" : "type-166",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4001,18 +4001,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-216",
-   "return_type" : "type-76",
-   "self_type" : "type-216",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIt",
+   "self_type" : "_ZTIFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4022,12 +4022,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     }
    ],
-   "referenced_type" : "type-55",
-   "return_type" : "type-13",
-   "self_type" : "type-55",
+   "referenced_type" : "_ZTIFvP7_JNIEnvE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4037,21 +4037,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-384"
+     "referenced_type" : "_ZTIP10_jintArray"
     },
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "_ZTIPi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-430",
-   "return_type" : "type-13",
-   "self_type" : "type-430",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayPiiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP10_jintArrayPiiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4061,24 +4061,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-384"
+     "referenced_type" : "_ZTIP10_jintArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-467"
+     "referenced_type" : "_ZTIPKi"
     }
    ],
-   "referenced_type" : "type-466",
-   "return_type" : "type-13",
-   "self_type" : "type-466",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPKiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPKiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4088,24 +4088,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-384"
+     "referenced_type" : "_ZTIP10_jintArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "_ZTIPi"
     }
    ],
-   "referenced_type" : "type-446",
-   "return_type" : "type-13",
-   "self_type" : "type-446",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4115,21 +4115,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-372"
+     "referenced_type" : "_ZTIP11_jbyteArray"
     },
     {
-     "referenced_type" : "type-402"
+     "referenced_type" : "_ZTIPa"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-424",
-   "return_type" : "type-13",
-   "self_type" : "type-424",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayPaiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayPaiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4139,24 +4139,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-372"
+     "referenced_type" : "_ZTIP11_jbyteArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "_ZTIPKa"
     }
    ],
-   "referenced_type" : "type-458",
-   "return_type" : "type-13",
-   "self_type" : "type-458",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPKaE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPKaE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4166,24 +4166,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-372"
+     "referenced_type" : "_ZTIP11_jbyteArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-402"
+     "referenced_type" : "_ZTIPa"
     }
    ],
-   "referenced_type" : "type-440",
-   "return_type" : "type-13",
-   "self_type" : "type-440",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPaE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPaE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4193,21 +4193,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-376"
+     "referenced_type" : "_ZTIP11_jcharArray"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "_ZTIPt"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-426",
-   "return_type" : "type-13",
-   "self_type" : "type-426",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayPtiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayPtiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4217,24 +4217,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-376"
+     "referenced_type" : "_ZTIP11_jcharArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-339"
+     "referenced_type" : "_ZTIPKt"
     }
    ],
-   "referenced_type" : "type-460",
-   "return_type" : "type-13",
-   "self_type" : "type-460",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPKtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPKtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4244,24 +4244,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-376"
+     "referenced_type" : "_ZTIP11_jcharArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "_ZTIPt"
     }
    ],
-   "referenced_type" : "type-442",
-   "return_type" : "type-13",
-   "self_type" : "type-442",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4271,21 +4271,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-388"
+     "referenced_type" : "_ZTIP11_jlongArray"
     },
     {
-     "referenced_type" : "type-414"
+     "referenced_type" : "_ZTIPx"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-432",
-   "return_type" : "type-13",
-   "self_type" : "type-432",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayPxiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayPxiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4295,24 +4295,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-388"
+     "referenced_type" : "_ZTIP11_jlongArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-471"
+     "referenced_type" : "_ZTIPKx"
     }
    ],
-   "referenced_type" : "type-470",
-   "return_type" : "type-13",
-   "self_type" : "type-470",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPKxE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPKxE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4322,24 +4322,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-388"
+     "referenced_type" : "_ZTIP11_jlongArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-414"
+     "referenced_type" : "_ZTIPx"
     }
    ],
-   "referenced_type" : "type-448",
-   "return_type" : "type-13",
-   "self_type" : "type-448",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPxE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPxE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4349,21 +4349,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-392"
+     "referenced_type" : "_ZTIP12_jfloatArray"
     },
     {
-     "referenced_type" : "type-417"
+     "referenced_type" : "_ZTIPf"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-434",
-   "return_type" : "type-13",
-   "self_type" : "type-434",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayPfiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayPfiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4373,24 +4373,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-392"
+     "referenced_type" : "_ZTIP12_jfloatArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "_ZTIPKf"
     }
    ],
-   "referenced_type" : "type-474",
-   "return_type" : "type-13",
-   "self_type" : "type-474",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPKfE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPKfE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4400,24 +4400,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-392"
+     "referenced_type" : "_ZTIP12_jfloatArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-417"
+     "referenced_type" : "_ZTIPf"
     }
    ],
-   "referenced_type" : "type-450",
-   "return_type" : "type-13",
-   "self_type" : "type-450",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPfE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPfE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4427,21 +4427,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-380"
+     "referenced_type" : "_ZTIP12_jshortArray"
     },
     {
-     "referenced_type" : "type-408"
+     "referenced_type" : "_ZTIPs"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-428",
-   "return_type" : "type-13",
-   "self_type" : "type-428",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayPsiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayPsiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4451,24 +4451,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-380"
+     "referenced_type" : "_ZTIP12_jshortArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-463"
+     "referenced_type" : "_ZTIPKs"
     }
    ],
-   "referenced_type" : "type-462",
-   "return_type" : "type-13",
-   "self_type" : "type-462",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPKsE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPKsE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4478,24 +4478,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-380"
+     "referenced_type" : "_ZTIP12_jshortArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-408"
+     "referenced_type" : "_ZTIPs"
     }
    ],
-   "referenced_type" : "type-444",
-   "return_type" : "type-13",
-   "self_type" : "type-444",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPsE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPsE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4505,21 +4505,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-396"
+     "referenced_type" : "_ZTIP13_jdoubleArray"
     },
     {
-     "referenced_type" : "type-420"
+     "referenced_type" : "_ZTIPd"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-436",
-   "return_type" : "type-13",
-   "self_type" : "type-436",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayPdiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayPdiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4529,24 +4529,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-396"
+     "referenced_type" : "_ZTIP13_jdoubleArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-479"
+     "referenced_type" : "_ZTIPKd"
     }
    ],
-   "referenced_type" : "type-478",
-   "return_type" : "type-13",
-   "self_type" : "type-478",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4556,24 +4556,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-396"
+     "referenced_type" : "_ZTIP13_jdoubleArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-420"
+     "referenced_type" : "_ZTIPd"
     }
    ],
-   "referenced_type" : "type-452",
-   "return_type" : "type-13",
-   "self_type" : "type-452",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPdE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPdE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4583,21 +4583,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-360"
+     "referenced_type" : "_ZTIP13_jobjectArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-365",
-   "return_type" : "type-13",
-   "self_type" : "type-365",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4607,21 +4607,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "_ZTIP14_jbooleanArray"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-422",
-   "return_type" : "type-13",
-   "self_type" : "type-422",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayPhiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayPhiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4631,24 +4631,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "_ZTIP14_jbooleanArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-455"
+     "referenced_type" : "_ZTIPKh"
     }
    ],
-   "referenced_type" : "type-454",
-   "return_type" : "type-13",
-   "self_type" : "type-454",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4658,24 +4658,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "_ZTIP14_jbooleanArray"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "_ZTIPh"
     }
    ],
-   "referenced_type" : "type-438",
-   "return_type" : "type-13",
-   "self_type" : "type-438",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPhE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4685,21 +4685,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-356"
+     "referenced_type" : "_ZTIP7_jarray"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-513",
-   "return_type" : "type-13",
-   "self_type" : "type-513",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jarrayPviE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jarrayPviE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4709,21 +4709,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-298",
-   "return_type" : "type-13",
-   "self_type" : "type-298",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4733,21 +4733,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-296",
-   "return_type" : "type-13",
-   "self_type" : "type-296",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4757,18 +4757,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-294",
-   "return_type" : "type-13",
-   "self_type" : "type-294",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4778,21 +4778,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-318",
-   "return_type" : "type-13",
-   "self_type" : "type-318",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4802,21 +4802,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-26"
+     "referenced_type" : "_ZTIa"
     }
    ],
-   "referenced_type" : "type-322",
-   "return_type" : "type-13",
-   "self_type" : "type-322",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4826,21 +4826,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "_ZTId"
     }
    ],
-   "referenced_type" : "type-334",
-   "return_type" : "type-13",
-   "self_type" : "type-334",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4850,21 +4850,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-79"
+     "referenced_type" : "_ZTIf"
     }
    ],
-   "referenced_type" : "type-332",
-   "return_type" : "type-13",
-   "self_type" : "type-332",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4874,21 +4874,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     }
    ],
-   "referenced_type" : "type-320",
-   "return_type" : "type-13",
-   "self_type" : "type-320",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4898,21 +4898,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-328",
-   "return_type" : "type-13",
-   "self_type" : "type-328",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4922,21 +4922,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-77"
+     "referenced_type" : "_ZTIs"
     }
    ],
-   "referenced_type" : "type-326",
-   "return_type" : "type-13",
-   "self_type" : "type-326",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4946,21 +4946,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "_ZTIt"
     }
    ],
-   "referenced_type" : "type-324",
-   "return_type" : "type-13",
-   "self_type" : "type-324",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4970,21 +4970,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "_ZTIx"
     }
    ],
-   "referenced_type" : "type-330",
-   "return_type" : "type-13",
-   "self_type" : "type-330",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDxE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDxE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -4994,15 +4994,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-63",
-   "return_type" : "type-13",
-   "self_type" : "type-63",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5012,21 +5012,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-146",
-   "return_type" : "type-13",
-   "self_type" : "type-146",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5036,21 +5036,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-144",
-   "return_type" : "type-13",
-   "self_type" : "type-144",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5060,18 +5060,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-142",
-   "return_type" : "type-13",
-   "self_type" : "type-142",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5081,24 +5081,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-206",
-   "return_type" : "type-13",
-   "self_type" : "type-206",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5108,24 +5108,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-204",
-   "return_type" : "type-13",
-   "self_type" : "type-204",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5135,21 +5135,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-202",
-   "return_type" : "type-13",
-   "self_type" : "type-202",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5159,21 +5159,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-228",
-   "return_type" : "type-13",
-   "self_type" : "type-228",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5183,21 +5183,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-26"
+     "referenced_type" : "_ZTIa"
     }
    ],
-   "referenced_type" : "type-232",
-   "return_type" : "type-13",
-   "self_type" : "type-232",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5207,21 +5207,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "_ZTId"
     }
    ],
-   "referenced_type" : "type-244",
-   "return_type" : "type-13",
-   "self_type" : "type-244",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5231,21 +5231,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-79"
+     "referenced_type" : "_ZTIf"
     }
    ],
-   "referenced_type" : "type-242",
-   "return_type" : "type-13",
-   "self_type" : "type-242",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5255,21 +5255,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     }
    ],
-   "referenced_type" : "type-230",
-   "return_type" : "type-13",
-   "self_type" : "type-230",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5279,21 +5279,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-238",
-   "return_type" : "type-13",
-   "self_type" : "type-238",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5303,21 +5303,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-77"
+     "referenced_type" : "_ZTIs"
     }
    ],
-   "referenced_type" : "type-236",
-   "return_type" : "type-13",
-   "self_type" : "type-236",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5327,21 +5327,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "_ZTIt"
     }
    ],
-   "referenced_type" : "type-234",
-   "return_type" : "type-13",
-   "self_type" : "type-234",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5351,21 +5351,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     },
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "_ZTIx"
     }
    ],
-   "referenced_type" : "type-240",
-   "return_type" : "type-13",
-   "self_type" : "type-240",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDxE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDxE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5375,18 +5375,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-337"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-353",
-   "return_type" : "type-13",
-   "self_type" : "type-353",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringPKcE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jstringPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5396,18 +5396,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-337"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-339"
+     "referenced_type" : "_ZTIPKt"
     }
    ],
-   "referenced_type" : "type-347",
-   "return_type" : "type-13",
-   "self_type" : "type-347",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringPKtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jstringPKtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5417,24 +5417,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-337"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-509",
-   "return_type" : "type-13",
-   "self_type" : "type-509",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPcE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5444,24 +5444,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-337"
+     "referenced_type" : "_ZTIP8_jstring"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "_ZTIPt"
     }
    ],
-   "referenced_type" : "type-507",
-   "return_type" : "type-13",
-   "self_type" : "type-507",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPtE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPtE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5471,15 +5471,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-57",
-   "return_type" : "type-13",
-   "self_type" : "type-57",
+   "referenced_type" : "_ZTIFvP7_JNIEnvPKcE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvP7_JNIEnvPKcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5489,12 +5489,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "referenced_type" : "type-559",
-   "return_type" : "type-13",
-   "self_type" : "type-559",
+   "referenced_type" : "_ZTIFvPvE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvPvE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5504,18 +5504,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-525"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-556"
+     "referenced_type" : "_ZTIb"
     }
    ],
-   "referenced_type" : "type-636",
-   "return_type" : "type-13",
-   "self_type" : "type-636",
+   "referenced_type" : "_ZTIFvPvjbE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvPvjbE",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -5525,21 +5525,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-280",
-   "return_type" : "type-78",
-   "self_type" : "type-280",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5549,21 +5549,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-278",
-   "return_type" : "type-78",
-   "self_type" : "type-278",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5573,18 +5573,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-276",
-   "return_type" : "type-78",
-   "self_type" : "type-276",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5594,18 +5594,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-312",
-   "return_type" : "type-78",
-   "self_type" : "type-312",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP7_jclassP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5615,15 +5615,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "referenced_type" : "type-521",
-   "return_type" : "type-78",
-   "self_type" : "type-521",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5633,21 +5633,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-128",
-   "return_type" : "type-78",
-   "self_type" : "type-128",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5657,21 +5657,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-126",
-   "return_type" : "type-78",
-   "self_type" : "type-126",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5681,18 +5681,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-124",
-   "return_type" : "type-78",
-   "self_type" : "type-124",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5702,24 +5702,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-73"
+     "referenced_type" : "_ZTIPK6jvalue"
     }
    ],
-   "referenced_type" : "type-188",
-   "return_type" : "type-78",
-   "self_type" : "type-188",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5729,24 +5729,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "_ZTIPc"
     }
    ],
-   "referenced_type" : "type-186",
-   "return_type" : "type-78",
-   "self_type" : "type-186",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5756,21 +5756,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP7_jclass"
     },
     {
-     "referenced_type" : "type-31"
+     "referenced_type" : "_ZTIP10_jmethodID"
     }
    ],
-   "referenced_type" : "type-184",
-   "return_type" : "type-78",
-   "self_type" : "type-184",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
   {
@@ -5780,18 +5780,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "_ZTIP9_jfieldID"
     }
    ],
-   "referenced_type" : "type-222",
-   "return_type" : "type-78",
-   "self_type" : "type-222",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "return_type" : "_ZTIx",
+   "self_type" : "_ZTIFxP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "source_file" : "/libnativehelper/include_jni/jni.h"
   }
  ],
@@ -5800,7 +5800,7 @@
   {
    "function_name" : "ABinderProcess_joinThreadPool",
    "linker_set_key" : "ABinderProcess_joinThreadPool",
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_process.h"
   },
   {
@@ -5809,16 +5809,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-525"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "type-556",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_process.h"
   },
   {
    "function_name" : "ABinderProcess_startThreadPool",
    "linker_set_key" : "ABinderProcess_startThreadPool",
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_process.h"
   },
   {
@@ -5827,19 +5827,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-568"
+     "referenced_type" : "_ZTIPFPvS_E"
     },
     {
-     "referenced_type" : "type-605"
+     "referenced_type" : "_ZTIPFvPvE"
     },
     {
-     "referenced_type" : "type-546"
+     "referenced_type" : "_ZTIPFiP8AIBinderjPK7AParcelPS1_E"
     }
    ],
-   "return_type" : "type-1",
+   "return_type" : "_ZTIP14AIBinder_Class",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5848,13 +5848,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1"
+     "referenced_type" : "_ZTIP14AIBinder_Class"
     },
     {
-     "referenced_type" : "type-552"
+     "referenced_type" : "_ZTIPFiP8AIBinderiPPKcjE"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5863,10 +5863,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-561"
+     "referenced_type" : "_ZTIP23AIBinder_DeathRecipient"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5875,10 +5875,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-605"
+     "referenced_type" : "_ZTIPFvPvE"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "_ZTIP23AIBinder_DeathRecipient",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5887,10 +5887,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-564"
+     "referenced_type" : "_ZTIP13AIBinder_Weak"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5899,10 +5899,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-564",
+   "return_type" : "_ZTIP13AIBinder_Weak",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5911,10 +5911,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-564"
+     "referenced_type" : "_ZTIP13AIBinder_Weak"
     }
    ],
-   "return_type" : "type-548",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5923,13 +5923,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIPK14AIBinder_Class"
     }
    ],
-   "return_type" : "type-556",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5938,10 +5938,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5950,10 +5950,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5962,19 +5962,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-551"
+     "referenced_type" : "_ZTIPPKc"
     },
     {
-     "referenced_type" : "type-525"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -5983,25 +5983,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
-   "return_type" : "type-573",
+   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder_jni.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
   },
   {
    "function_name" : "AIBinder_getCallingPid",
    "linker_set_key" : "AIBinder_getCallingPid",
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
    "function_name" : "AIBinder_getCallingUid",
    "linker_set_key" : "AIBinder_getCallingUid",
-   "return_type" : "type-525",
+   "return_type" : "_ZTIj",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6010,10 +6010,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-555",
+   "return_type" : "_ZTIPK14AIBinder_Class",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6022,13 +6022,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-566"
+     "referenced_type" : "_ZTIPP8AIBinder"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6037,10 +6037,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "_ZTIPv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6049,10 +6049,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6061,10 +6061,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-560"
+     "referenced_type" : "_ZTIPK8AIBinder"
     }
    ],
-   "return_type" : "type-556",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6073,10 +6073,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-560"
+     "referenced_type" : "_ZTIPK8AIBinder"
     }
    ],
-   "return_type" : "type-556",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6085,16 +6085,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-561"
+     "referenced_type" : "_ZTIP23AIBinder_DeathRecipient"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6103,10 +6103,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-645"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/stability.sdump"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h"
   },
   {
@@ -6115,10 +6115,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-645"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/stability.sdump"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h"
   },
   {
@@ -6127,13 +6127,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "_ZTIPK14AIBinder_Class"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "return_type" : "type-548",
+   "return_type" : "_ZTIP8AIBinder",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6142,10 +6142,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6154,13 +6154,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-563"
+     "referenced_type" : "_ZTIPP7AParcel"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6169,13 +6169,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6184,13 +6184,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIP7_JNIEnv"
     },
     {
-     "referenced_type" : "type-573"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder_jni.sdump"
     }
    ],
-   "return_type" : "type-5",
+   "return_type" : "_ZTIP8_jobject",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
   },
   {
@@ -6199,22 +6199,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-525"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-563"
+     "referenced_type" : "_ZTIPP7AParcel"
     },
     {
-     "referenced_type" : "type-563"
+     "referenced_type" : "_ZTIPP7AParcel"
     },
     {
-     "referenced_type" : "type-525"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6223,16 +6223,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-548"
+     "referenced_type" : "_ZTIP8AIBinder"
     },
     {
-     "referenced_type" : "type-561"
+     "referenced_type" : "_ZTIP23AIBinder_DeathRecipient"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
@@ -6241,10 +6241,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6253,10 +6253,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6265,13 +6265,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "_ZTIPb"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6280,19 +6280,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIPFbPviE"
     },
     {
-     "referenced_type" : "type-637"
+     "referenced_type" : "_ZTIPFvPvjbE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6301,13 +6301,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-402"
+     "referenced_type" : "_ZTIPa"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6316,16 +6316,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-644"
+     "referenced_type" : "_ZTIPFbPviPPaE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6334,13 +6334,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-607"
+     "referenced_type" : "_ZTIPDs"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6349,16 +6349,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "_ZTIPFbPviPPDsE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6367,13 +6367,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-420"
+     "referenced_type" : "_ZTIPd"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6382,16 +6382,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-635"
+     "referenced_type" : "_ZTIPFbPviPPdE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6400,13 +6400,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-417"
+     "referenced_type" : "_ZTIPf"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6415,16 +6415,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "_ZTIPFbPviPPfE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6433,13 +6433,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "_ZTIPi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6448,16 +6448,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-618"
+     "referenced_type" : "_ZTIPFbPviPPiE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6466,13 +6466,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-414"
+     "referenced_type" : "_ZTIPx"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6481,16 +6481,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-624"
+     "referenced_type" : "_ZTIPFbPviPPxE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6499,13 +6499,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "_ZTIPi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6514,19 +6514,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIPFbPviE"
     },
     {
-     "referenced_type" : "type-600"
+     "referenced_type" : "_ZTIPFiPK7AParcelPvjE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6535,13 +6535,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-580"
+     "referenced_type" : "_ZTIPP7AStatus"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6550,16 +6550,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-583"
+     "referenced_type" : "_ZTIPFbPviPPcE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6568,19 +6568,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "_ZTIPFbPviE"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "_ZTIPFbPvjiPPcE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6589,13 +6589,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-638"
+     "referenced_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6604,13 +6604,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-603"
+     "referenced_type" : "_ZTIPj"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6619,16 +6619,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-621"
+     "referenced_type" : "_ZTIPFbPviPPjE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6637,13 +6637,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-604"
+     "referenced_type" : "_ZTIPy"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6652,16 +6652,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "_ZTIPFbPviPPyE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6670,13 +6670,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-597"
+     "referenced_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6685,13 +6685,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-556"
+     "referenced_type" : "_ZTIb"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6700,19 +6700,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-585"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-613"
+     "referenced_type" : "_ZTIPFbPKvjE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6721,13 +6721,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-26"
+     "referenced_type" : "_ZTIa"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6736,16 +6736,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "_ZTIPKa"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6754,13 +6754,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-602"
+     "referenced_type" : "_ZTIDs"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6769,16 +6769,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-615"
+     "referenced_type" : "_ZTIPKDs"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6787,13 +6787,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "_ZTId"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6802,16 +6802,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-479"
+     "referenced_type" : "_ZTIPKd"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6820,13 +6820,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-79"
+     "referenced_type" : "_ZTIf"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6835,16 +6835,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "_ZTIPKf"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6853,13 +6853,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6868,16 +6868,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-467"
+     "referenced_type" : "_ZTIPKi"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6886,13 +6886,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "_ZTIx"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6901,16 +6901,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-471"
+     "referenced_type" : "_ZTIPKx"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6919,13 +6919,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6934,19 +6934,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-585"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-595"
+     "referenced_type" : "_ZTIPFiP7AParcelPKvjE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6955,13 +6955,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-577"
+     "referenced_type" : "_ZTIPK7AStatus"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6970,16 +6970,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -6988,19 +6988,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-585"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-587"
+     "referenced_type" : "_ZTIPFPKcPKvjPiE"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7009,13 +7009,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-627"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7024,13 +7024,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-525"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7039,16 +7039,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-609"
+     "referenced_type" : "_ZTIPKj"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7057,13 +7057,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-601"
+     "referenced_type" : "_ZTIy"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7072,16 +7072,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-588"
+     "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump"
     },
     {
-     "referenced_type" : "type-611"
+     "referenced_type" : "_ZTIPKy"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -7090,13 +7090,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-652"
+     "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7105,10 +7105,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-652",
+   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7117,10 +7117,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-652",
+   "return_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/service_manager.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
@@ -7129,10 +7129,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-647"
+     "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7141,10 +7141,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "_ZTIv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7153,10 +7153,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-647",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7165,13 +7165,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-647",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7180,10 +7180,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-647",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7192,13 +7192,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "type-647",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7207,10 +7207,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-647",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7219,10 +7219,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-651"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-21",
+   "return_type" : "_ZTIPKc",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7231,10 +7231,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-651"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7243,10 +7243,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-651"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-21",
+   "return_type" : "_ZTIPKc",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7255,10 +7255,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-651"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7267,10 +7267,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-651"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "_ZTIi",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
@@ -7279,16 +7279,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-651"
+     "referenced_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump"
     }
    ],
-   "return_type" : "type-556",
+   "return_type" : "_ZTIb",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
    "function_name" : "AStatus_newOk",
    "linker_set_key" : "AStatus_newOk",
-   "return_type" : "type-647",
+   "return_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   }
  ],
@@ -7300,8 +7300,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP10_jintArray",
    "name" : "_jintArray *",
-   "referenced_type" : "type-385",
-   "self_type" : "type-384",
+   "referenced_type" : "_ZTI10_jintArray",
+   "self_type" : "_ZTIP10_jintArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7309,17 +7309,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP10_jmethodID",
    "name" : "_jmethodID *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-31",
-   "size" : 4,
-   "source_file" : "/libnativehelper/include_jni/jni.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP10_jmethodID",
-   "name" : "_jmethodID *",
-   "referenced_type" : "type-676",
-   "self_type" : "type-675",
+   "referenced_type" : "_ZTI10_jmethodID",
+   "self_type" : "_ZTIP10_jmethodID",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7327,8 +7318,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP11_jbyteArray",
    "name" : "_jbyteArray *",
-   "referenced_type" : "type-373",
-   "self_type" : "type-372",
+   "referenced_type" : "_ZTI11_jbyteArray",
+   "self_type" : "_ZTIP11_jbyteArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7336,8 +7327,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP11_jcharArray",
    "name" : "_jcharArray *",
-   "referenced_type" : "type-377",
-   "self_type" : "type-376",
+   "referenced_type" : "_ZTI11_jcharArray",
+   "self_type" : "_ZTIP11_jcharArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7345,8 +7336,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP11_jlongArray",
    "name" : "_jlongArray *",
-   "referenced_type" : "type-389",
-   "self_type" : "type-388",
+   "referenced_type" : "_ZTI11_jlongArray",
+   "self_type" : "_ZTIP11_jlongArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7354,8 +7345,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP11_jthrowable",
    "name" : "_jthrowable *",
-   "referenced_type" : "type-49",
-   "self_type" : "type-48",
+   "referenced_type" : "_ZTI11_jthrowable",
+   "self_type" : "_ZTIP11_jthrowable",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7363,8 +7354,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP12JavaVMOption",
    "name" : "JavaVMOption *",
-   "referenced_type" : "type-570",
-   "self_type" : "type-572",
+   "referenced_type" : "_ZTI12JavaVMOption",
+   "self_type" : "_ZTIP12JavaVMOption",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7372,8 +7363,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP12_jfloatArray",
    "name" : "_jfloatArray *",
-   "referenced_type" : "type-393",
-   "self_type" : "type-392",
+   "referenced_type" : "_ZTI12_jfloatArray",
+   "self_type" : "_ZTIP12_jfloatArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7381,8 +7372,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP12_jshortArray",
    "name" : "_jshortArray *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-380",
+   "referenced_type" : "_ZTI12_jshortArray",
+   "self_type" : "_ZTIP12_jshortArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7390,17 +7381,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP13AIBinder_Weak",
    "name" : "AIBinder_Weak *",
-   "referenced_type" : "type-565",
-   "self_type" : "type-564",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP13AIBinder_Weak",
-   "name" : "AIBinder_Weak *",
-   "referenced_type" : "type-673",
-   "self_type" : "type-672",
+   "referenced_type" : "_ZTI13AIBinder_Weak",
+   "self_type" : "_ZTIP13AIBinder_Weak",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -7408,8 +7390,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP13_jdoubleArray",
    "name" : "_jdoubleArray *",
-   "referenced_type" : "type-397",
-   "self_type" : "type-396",
+   "referenced_type" : "_ZTI13_jdoubleArray",
+   "self_type" : "_ZTIP13_jdoubleArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7417,8 +7399,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP13_jobjectArray",
    "name" : "_jobjectArray *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-360",
+   "referenced_type" : "_ZTI13_jobjectArray",
+   "self_type" : "_ZTIP13_jobjectArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7426,17 +7408,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP14AIBinder_Class",
    "name" : "AIBinder_Class *",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP14AIBinder_Class",
-   "name" : "AIBinder_Class *",
-   "referenced_type" : "type-655",
-   "self_type" : "type-654",
+   "referenced_type" : "_ZTI14AIBinder_Class",
+   "self_type" : "_ZTIP14AIBinder_Class",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -7444,8 +7417,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP14_jbooleanArray",
    "name" : "_jbooleanArray *",
-   "referenced_type" : "type-369",
-   "self_type" : "type-368",
+   "referenced_type" : "_ZTI14_jbooleanArray",
+   "self_type" : "_ZTIP14_jbooleanArray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7453,26 +7426,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP23AIBinder_DeathRecipient",
    "name" : "AIBinder_DeathRecipient *",
-   "referenced_type" : "type-562",
-   "self_type" : "type-561",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP23AIBinder_DeathRecipient",
-   "name" : "AIBinder_DeathRecipient *",
-   "referenced_type" : "type-670",
-   "self_type" : "type-669",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP7AParcel",
-   "name" : "AParcel *",
-   "referenced_type" : "type-545",
-   "self_type" : "type-544",
+   "referenced_type" : "_ZTI23AIBinder_DeathRecipient",
+   "self_type" : "_ZTIP23AIBinder_DeathRecipient",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -7480,62 +7435,17 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP7AParcel",
    "name" : "AParcel *",
-   "referenced_type" : "type-589",
-   "self_type" : "type-588",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP7AParcel",
-   "name" : "AParcel *",
-   "referenced_type" : "type-662",
-   "self_type" : "type-661",
+   "referenced_type" : "_ZTI7AParcel",
+   "self_type" : "_ZTIP7AParcel",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP7AParcel",
-   "name" : "AParcel *",
-   "referenced_type" : "type-688",
-   "self_type" : "type-687",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP7AStatus",
-   "name" : "AStatus *",
-   "referenced_type" : "type-535",
-   "self_type" : "type-534",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP7AStatus",
-   "name" : "AStatus *",
-   "referenced_type" : "type-579",
-   "self_type" : "type-578",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP7AStatus",
    "name" : "AStatus *",
-   "referenced_type" : "type-648",
-   "self_type" : "type-647",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP7AStatus",
-   "name" : "AStatus *",
-   "referenced_type" : "type-685",
-   "self_type" : "type-684",
+   "referenced_type" : "_ZTI7AStatus",
+   "self_type" : "_ZTIP7AStatus",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -7543,8 +7453,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP7_JNIEnv",
    "name" : "_JNIEnv *",
-   "referenced_type" : "type-8",
-   "self_type" : "type-7",
+   "referenced_type" : "_ZTI7_JNIEnv",
+   "self_type" : "_ZTIP7_JNIEnv",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7552,8 +7462,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP7_JavaVM",
    "name" : "_JavaVM *",
-   "referenced_type" : "type-494",
-   "self_type" : "type-493",
+   "referenced_type" : "_ZTI7_JavaVM",
+   "self_type" : "_ZTIP7_JavaVM",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7561,8 +7471,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP7_jarray",
    "name" : "_jarray *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-356",
+   "referenced_type" : "_ZTI7_jarray",
+   "self_type" : "_ZTIP7_jarray",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7570,8 +7480,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP7_jclass",
    "name" : "_jclass *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-19",
+   "referenced_type" : "_ZTI7_jclass",
+   "self_type" : "_ZTIP7_jclass",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7579,98 +7489,17 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP8AIBinder",
    "name" : "AIBinder *",
-   "referenced_type" : "type-530",
-   "self_type" : "type-529",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-533",
-   "self_type" : "type-532",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-540",
-   "self_type" : "type-539",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-549",
-   "self_type" : "type-548",
+   "referenced_type" : "_ZTI8AIBinder",
+   "self_type" : "_ZTIP8AIBinder",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-574",
-   "self_type" : "type-573",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-628",
-   "self_type" : "type-627",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-646",
-   "self_type" : "type-645",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_stability.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-653",
-   "self_type" : "type-652",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-657",
-   "self_type" : "type-656",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP8AIBinder",
-   "name" : "AIBinder *",
-   "referenced_type" : "type-680",
-   "self_type" : "type-679",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP8_jobject",
    "name" : "_jobject *",
-   "referenced_type" : "type-6",
-   "self_type" : "type-5",
+   "referenced_type" : "_ZTI8_jobject",
+   "self_type" : "_ZTIP8_jobject",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7678,17 +7507,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP8_jstring",
    "name" : "_jstring *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-337",
-   "size" : 4,
-   "source_file" : "/libnativehelper/include_jni/jni.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIP9_jfieldID",
-   "name" : "_jfieldID *",
-   "referenced_type" : "type-36",
-   "self_type" : "type-35",
+   "referenced_type" : "_ZTI8_jstring",
+   "self_type" : "_ZTIP8_jstring",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7696,8 +7516,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP9_jfieldID",
    "name" : "_jfieldID *",
-   "referenced_type" : "type-678",
-   "self_type" : "type-677",
+   "referenced_type" : "_ZTI9_jfieldID",
+   "self_type" : "_ZTIP9_jfieldID",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7705,8 +7525,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPDs",
    "name" : "char16_t *",
-   "referenced_type" : "type-602",
-   "self_type" : "type-607",
+   "referenced_type" : "_ZTIDs",
+   "self_type" : "_ZTIPDs",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -7714,8 +7534,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
    "name" : "jobjectRefType (*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-523",
-   "self_type" : "type-522",
+   "referenced_type" : "_ZTIF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPF14jobjectRefTypeP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7723,8 +7543,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP10_jintArrayP7_JNIEnviE",
    "name" : "_jintArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-383",
-   "self_type" : "type-382",
+   "referenced_type" : "_ZTIFP10_jintArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP10_jintArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7732,8 +7552,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
    "name" : "_jmethodID *(*)(_JNIEnv *, _jclass *, const char *, const char *)",
-   "referenced_type" : "type-86",
-   "self_type" : "type-85",
+   "referenced_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
+   "self_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7741,8 +7561,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP10_jmethodIDP7_JNIEnvP8_jobjectE",
    "name" : "_jmethodID *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-30",
-   "self_type" : "type-29",
+   "referenced_type" : "_ZTIFP10_jmethodIDP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7750,8 +7570,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP11_jbyteArrayP7_JNIEnviE",
    "name" : "_jbyteArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-371",
-   "self_type" : "type-370",
+   "referenced_type" : "_ZTIFP11_jbyteArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP11_jbyteArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7759,8 +7579,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP11_jcharArrayP7_JNIEnviE",
    "name" : "_jcharArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-375",
-   "self_type" : "type-374",
+   "referenced_type" : "_ZTIFP11_jcharArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP11_jcharArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7768,8 +7588,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP11_jlongArrayP7_JNIEnviE",
    "name" : "_jlongArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-387",
-   "self_type" : "type-386",
+   "referenced_type" : "_ZTIFP11_jlongArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP11_jlongArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7777,8 +7597,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP11_jthrowableP7_JNIEnvE",
    "name" : "_jthrowable *(*)(_JNIEnv *)",
-   "referenced_type" : "type-53",
-   "self_type" : "type-52",
+   "referenced_type" : "_ZTIFP11_jthrowableP7_JNIEnvE",
+   "self_type" : "_ZTIPFP11_jthrowableP7_JNIEnvE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7786,8 +7606,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP12_jfloatArrayP7_JNIEnviE",
    "name" : "_jfloatArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-391",
-   "self_type" : "type-390",
+   "referenced_type" : "_ZTIFP12_jfloatArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP12_jfloatArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7795,8 +7615,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP12_jshortArrayP7_JNIEnviE",
    "name" : "_jshortArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-379",
-   "self_type" : "type-378",
+   "referenced_type" : "_ZTIFP12_jshortArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP12_jshortArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7804,8 +7624,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP13_jdoubleArrayP7_JNIEnviE",
    "name" : "_jdoubleArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-395",
-   "self_type" : "type-394",
+   "referenced_type" : "_ZTIFP13_jdoubleArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP13_jdoubleArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7813,8 +7633,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
    "name" : "_jobjectArray *(*)(_JNIEnv *, int, _jclass *, _jobject *)",
-   "referenced_type" : "type-359",
-   "self_type" : "type-358",
+   "referenced_type" : "_ZTIFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
+   "self_type" : "_ZTIPFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7822,8 +7642,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP14_jbooleanArrayP7_JNIEnviE",
    "name" : "_jbooleanArray *(*)(_JNIEnv *, int)",
-   "referenced_type" : "type-367",
-   "self_type" : "type-366",
+   "referenced_type" : "_ZTIFP14_jbooleanArrayP7_JNIEnviE",
+   "self_type" : "_ZTIPFP14_jbooleanArrayP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7831,8 +7651,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP7_jclassP7_JNIEnvP8_jobjectE",
    "name" : "_jclass *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-82",
-   "self_type" : "type-81",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFP7_jclassP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7840,8 +7660,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP7_jclassP7_JNIEnvPKcE",
    "name" : "_jclass *(*)(_JNIEnv *, const char *)",
-   "referenced_type" : "type-28",
-   "self_type" : "type-27",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvPKcE",
+   "self_type" : "_ZTIPFP7_jclassP7_JNIEnvPKcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7849,8 +7669,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
    "name" : "_jclass *(*)(_JNIEnv *, const char *, _jobject *, const signed char *, int)",
-   "referenced_type" : "type-18",
-   "self_type" : "type-17",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
+   "self_type" : "_ZTIPFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7858,8 +7678,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP7_jclassP7_JNIEnvS0_E",
    "name" : "_jclass *(*)(_JNIEnv *, _jclass *)",
-   "referenced_type" : "type-41",
-   "self_type" : "type-40",
+   "referenced_type" : "_ZTIFP7_jclassP7_JNIEnvS0_E",
+   "self_type" : "_ZTIPFP7_jclassP7_JNIEnvS0_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7867,8 +7687,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobjectArray *, int)",
-   "referenced_type" : "type-363",
-   "self_type" : "type-362",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP13_jobjectArrayiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7876,8 +7696,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *)",
-   "referenced_type" : "type-4",
-   "self_type" : "type-3",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7885,8 +7705,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-72",
-   "self_type" : "type-71",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7894,8 +7714,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-69",
-   "self_type" : "type-68",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7903,8 +7723,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jmethodID *, unsigned char)",
-   "referenced_type" : "type-38",
-   "self_type" : "type-37",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7912,8 +7732,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-67",
-   "self_type" : "type-66",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7921,8 +7741,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-300",
-   "self_type" : "type-299",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7930,8 +7750,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "name" : "_jobject *(*)(_JNIEnv *, _jclass *, _jfieldID *, unsigned char)",
-   "referenced_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7939,8 +7759,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvPvxE",
    "name" : "_jobject *(*)(_JNIEnv *, void *, long long)",
-   "referenced_type" : "type-517",
-   "self_type" : "type-516",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvPvxE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvPvxE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7948,8 +7768,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-61",
-   "self_type" : "type-60",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_E",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7957,8 +7777,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-92",
-   "self_type" : "type-91",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7966,8 +7786,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPcE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jmethodID *, char *)",
-   "referenced_type" : "type-90",
-   "self_type" : "type-89",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPcE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7975,8 +7795,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-88",
-   "self_type" : "type-87",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7984,8 +7804,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-152",
-   "self_type" : "type-151",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -7993,8 +7813,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPcE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-150",
-   "self_type" : "type-149",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8002,8 +7822,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-148",
-   "self_type" : "type-147",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8011,8 +7831,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
    "name" : "_jobject *(*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-210",
-   "self_type" : "type-209",
+   "referenced_type" : "_ZTIFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
+   "self_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8020,8 +7840,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jstringP7_JNIEnvPKcE",
    "name" : "_jstring *(*)(_JNIEnv *, const char *)",
-   "referenced_type" : "type-349",
-   "self_type" : "type-348",
+   "referenced_type" : "_ZTIFP8_jstringP7_JNIEnvPKcE",
+   "self_type" : "_ZTIPFP8_jstringP7_JNIEnvPKcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8029,8 +7849,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP8_jstringP7_JNIEnvPKtiE",
    "name" : "_jstring *(*)(_JNIEnv *, const unsigned short *, int)",
-   "referenced_type" : "type-336",
-   "self_type" : "type-335",
+   "referenced_type" : "_ZTIFP8_jstringP7_JNIEnvPKtiE",
+   "self_type" : "_ZTIPFP8_jstringP7_JNIEnvPKtiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8038,8 +7858,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
    "name" : "_jfieldID *(*)(_JNIEnv *, _jclass *, const char *, const char *)",
-   "referenced_type" : "type-208",
-   "self_type" : "type-207",
+   "referenced_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
+   "self_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8047,8 +7867,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFP9_jfieldIDP7_JNIEnvP8_jobjectE",
    "name" : "_jfieldID *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-34",
-   "self_type" : "type-33",
+   "referenced_type" : "_ZTIFP9_jfieldIDP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8056,8 +7876,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPKcP7_JNIEnvP8_jstringPhE",
    "name" : "const char *(*)(_JNIEnv *, _jstring *, unsigned char *)",
-   "referenced_type" : "type-351",
-   "self_type" : "type-350",
+   "referenced_type" : "_ZTIFPKcP7_JNIEnvP8_jstringPhE",
+   "self_type" : "_ZTIPFPKcP7_JNIEnvP8_jstringPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8065,8 +7885,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPKcPKvjPiE",
    "name" : "const char *(*)(const void *, unsigned int, int *)",
-   "referenced_type" : "type-586",
-   "self_type" : "type-587",
+   "referenced_type" : "_ZTIFPKcPKvjPiE",
+   "self_type" : "_ZTIPFPKcPKvjPiE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8074,8 +7894,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPKtP7_JNIEnvP8_jstringPhE",
    "name" : "const unsigned short *(*)(_JNIEnv *, _jstring *, unsigned char *)",
-   "referenced_type" : "type-344",
-   "self_type" : "type-343",
+   "referenced_type" : "_ZTIFPKtP7_JNIEnvP8_jstringPhE",
+   "self_type" : "_ZTIPFPKtP7_JNIEnvP8_jstringPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8083,8 +7903,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPaP7_JNIEnvP11_jbyteArrayPhE",
    "name" : "signed char *(*)(_JNIEnv *, _jbyteArray *, unsigned char *)",
-   "referenced_type" : "type-401",
-   "self_type" : "type-400",
+   "referenced_type" : "_ZTIFPaP7_JNIEnvP11_jbyteArrayPhE",
+   "self_type" : "_ZTIPFPaP7_JNIEnvP11_jbyteArrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8092,8 +7912,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPdP7_JNIEnvP13_jdoubleArrayPhE",
    "name" : "double *(*)(_JNIEnv *, _jdoubleArray *, unsigned char *)",
-   "referenced_type" : "type-419",
-   "self_type" : "type-418",
+   "referenced_type" : "_ZTIFPdP7_JNIEnvP13_jdoubleArrayPhE",
+   "self_type" : "_ZTIPFPdP7_JNIEnvP13_jdoubleArrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8101,8 +7921,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPfP7_JNIEnvP12_jfloatArrayPhE",
    "name" : "float *(*)(_JNIEnv *, _jfloatArray *, unsigned char *)",
-   "referenced_type" : "type-416",
-   "self_type" : "type-415",
+   "referenced_type" : "_ZTIFPfP7_JNIEnvP12_jfloatArrayPhE",
+   "self_type" : "_ZTIPFPfP7_JNIEnvP12_jfloatArrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8110,8 +7930,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPhP7_JNIEnvP14_jbooleanArrayS_E",
    "name" : "unsigned char *(*)(_JNIEnv *, _jbooleanArray *, unsigned char *)",
-   "referenced_type" : "type-399",
-   "self_type" : "type-398",
+   "referenced_type" : "_ZTIFPhP7_JNIEnvP14_jbooleanArrayS_E",
+   "self_type" : "_ZTIPFPhP7_JNIEnvP14_jbooleanArrayS_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8119,8 +7939,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPiP7_JNIEnvP10_jintArrayPhE",
    "name" : "int *(*)(_JNIEnv *, _jintArray *, unsigned char *)",
-   "referenced_type" : "type-410",
-   "self_type" : "type-409",
+   "referenced_type" : "_ZTIFPiP7_JNIEnvP10_jintArrayPhE",
+   "self_type" : "_ZTIPFPiP7_JNIEnvP10_jintArrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8128,8 +7948,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPsP7_JNIEnvP12_jshortArrayPhE",
    "name" : "short *(*)(_JNIEnv *, _jshortArray *, unsigned char *)",
-   "referenced_type" : "type-407",
-   "self_type" : "type-406",
+   "referenced_type" : "_ZTIFPsP7_JNIEnvP12_jshortArrayPhE",
+   "self_type" : "_ZTIPFPsP7_JNIEnvP12_jshortArrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8137,8 +7957,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPtP7_JNIEnvP11_jcharArrayPhE",
    "name" : "unsigned short *(*)(_JNIEnv *, _jcharArray *, unsigned char *)",
-   "referenced_type" : "type-404",
-   "self_type" : "type-403",
+   "referenced_type" : "_ZTIFPtP7_JNIEnvP11_jcharArrayPhE",
+   "self_type" : "_ZTIPFPtP7_JNIEnvP11_jcharArrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8146,8 +7966,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPvP7_JNIEnvP7_jarrayPhE",
    "name" : "void *(*)(_JNIEnv *, _jarray *, unsigned char *)",
-   "referenced_type" : "type-511",
-   "self_type" : "type-510",
+   "referenced_type" : "_ZTIFPvP7_JNIEnvP7_jarrayPhE",
+   "self_type" : "_ZTIPFPvP7_JNIEnvP7_jarrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8155,8 +7975,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPvP7_JNIEnvP8_jobjectE",
    "name" : "void *(*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-519",
-   "self_type" : "type-518",
+   "referenced_type" : "_ZTIFPvP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFPvP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8164,8 +7984,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPvS_E",
    "name" : "void *(*)(void *)",
-   "referenced_type" : "type-567",
-   "self_type" : "type-568",
+   "referenced_type" : "_ZTIFPvS_E",
+   "self_type" : "_ZTIPFPvS_E",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -8173,8 +7993,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFPxP7_JNIEnvP11_jlongArrayPhE",
    "name" : "long long *(*)(_JNIEnv *, _jlongArray *, unsigned char *)",
-   "referenced_type" : "type-413",
-   "self_type" : "type-412",
+   "referenced_type" : "_ZTIFPxP7_JNIEnvP11_jlongArrayPhE",
+   "self_type" : "_ZTIPFPxP7_JNIEnvP11_jlongArrayPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8182,8 +8002,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "signed char (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-256",
-   "self_type" : "type-255",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8191,8 +8011,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "name" : "signed char (*)(_JNIEnv *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-254",
-   "self_type" : "type-253",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8200,8 +8020,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "signed char (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-252",
-   "self_type" : "type-251",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8209,8 +8029,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "signed char (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-304",
-   "self_type" : "type-303",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8218,8 +8038,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-104",
-   "self_type" : "type-103",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8227,8 +8047,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jmethodID *, char *)",
-   "referenced_type" : "type-102",
-   "self_type" : "type-101",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8236,8 +8056,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-100",
-   "self_type" : "type-99",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8245,8 +8065,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-164",
-   "self_type" : "type-163",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8254,8 +8074,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-162",
-   "self_type" : "type-161",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8263,8 +8083,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-160",
-   "self_type" : "type-159",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8272,8 +8092,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "signed char (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-214",
-   "self_type" : "type-213",
+   "referenced_type" : "_ZTIFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8281,8 +8101,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPKvjE",
    "name" : "bool (*)(const void *, unsigned int)",
-   "referenced_type" : "type-612",
-   "self_type" : "type-613",
+   "referenced_type" : "_ZTIFbPKvjE",
+   "self_type" : "_ZTIPFbPKvjE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8290,8 +8110,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviE",
    "name" : "bool (*)(void *, int)",
-   "referenced_type" : "type-590",
-   "self_type" : "type-591",
+   "referenced_type" : "_ZTIFbPviE",
+   "self_type" : "_ZTIPFbPviE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8299,8 +8119,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPDsE",
    "name" : "bool (*)(void *, int, char16_t **)",
-   "referenced_type" : "type-639",
-   "self_type" : "type-641",
+   "referenced_type" : "_ZTIFbPviPPDsE",
+   "self_type" : "_ZTIPFbPviPPDsE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8308,8 +8128,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPaE",
    "name" : "bool (*)(void *, int, signed char **)",
-   "referenced_type" : "type-642",
-   "self_type" : "type-644",
+   "referenced_type" : "_ZTIFbPviPPaE",
+   "self_type" : "_ZTIPFbPviPPaE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8317,8 +8137,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPcE",
    "name" : "bool (*)(void *, int, char **)",
-   "referenced_type" : "type-581",
-   "self_type" : "type-583",
+   "referenced_type" : "_ZTIFbPviPPcE",
+   "self_type" : "_ZTIPFbPviPPcE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8326,8 +8146,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPdE",
    "name" : "bool (*)(void *, int, double **)",
-   "referenced_type" : "type-633",
-   "self_type" : "type-635",
+   "referenced_type" : "_ZTIFbPviPPdE",
+   "self_type" : "_ZTIPFbPviPPdE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8335,8 +8155,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPfE",
    "name" : "bool (*)(void *, int, float **)",
-   "referenced_type" : "type-630",
-   "self_type" : "type-632",
+   "referenced_type" : "_ZTIFbPviPPfE",
+   "self_type" : "_ZTIPFbPviPPfE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8344,8 +8164,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPiE",
    "name" : "bool (*)(void *, int, int **)",
-   "referenced_type" : "type-616",
-   "self_type" : "type-618",
+   "referenced_type" : "_ZTIFbPviPPiE",
+   "self_type" : "_ZTIPFbPviPPiE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8353,8 +8173,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPjE",
    "name" : "bool (*)(void *, int, unsigned int **)",
-   "referenced_type" : "type-619",
-   "self_type" : "type-621",
+   "referenced_type" : "_ZTIFbPviPPjE",
+   "self_type" : "_ZTIPFbPviPPjE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8362,8 +8182,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPxE",
    "name" : "bool (*)(void *, int, long long **)",
-   "referenced_type" : "type-622",
-   "self_type" : "type-624",
+   "referenced_type" : "_ZTIFbPviPPxE",
+   "self_type" : "_ZTIPFbPviPPxE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8371,8 +8191,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPviPPyE",
    "name" : "bool (*)(void *, int, unsigned long long **)",
-   "referenced_type" : "type-625",
-   "self_type" : "type-629",
+   "referenced_type" : "_ZTIFbPviPPyE",
+   "self_type" : "_ZTIPFbPviPPyE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8380,8 +8200,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPvjiPPcE",
    "name" : "bool (*)(void *, unsigned int, int, char **)",
-   "referenced_type" : "type-592",
-   "self_type" : "type-593",
+   "referenced_type" : "_ZTIFbPvjiPPcE",
+   "self_type" : "_ZTIPFbPvjiPPcE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8389,8 +8209,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-292",
-   "self_type" : "type-291",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8398,8 +8218,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-290",
-   "self_type" : "type-289",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8407,8 +8227,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-288",
-   "self_type" : "type-287",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8416,8 +8236,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "double (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-316",
-   "self_type" : "type-315",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8425,8 +8245,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-140",
-   "self_type" : "type-139",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8434,8 +8254,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jmethodID *, char *)",
-   "referenced_type" : "type-138",
-   "self_type" : "type-137",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8443,8 +8263,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-136",
-   "self_type" : "type-135",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8452,8 +8272,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-200",
-   "self_type" : "type-199",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8461,8 +8281,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-198",
-   "self_type" : "type-197",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8470,8 +8290,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-196",
-   "self_type" : "type-195",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8479,8 +8299,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "double (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-226",
-   "self_type" : "type-225",
+   "referenced_type" : "_ZTIFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8488,8 +8308,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "float (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-286",
-   "self_type" : "type-285",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8497,8 +8317,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "name" : "float (*)(_JNIEnv *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-284",
-   "self_type" : "type-283",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8506,8 +8326,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "float (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-282",
-   "self_type" : "type-281",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8515,8 +8335,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "float (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-314",
-   "self_type" : "type-313",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8524,8 +8344,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-134",
-   "self_type" : "type-133",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8533,8 +8353,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jmethodID *, char *)",
-   "referenced_type" : "type-132",
-   "self_type" : "type-131",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8542,8 +8362,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-130",
-   "self_type" : "type-129",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8551,8 +8371,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-194",
-   "self_type" : "type-193",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8560,8 +8380,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-192",
-   "self_type" : "type-191",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8569,8 +8389,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-190",
-   "self_type" : "type-189",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8578,8 +8398,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "float (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-224",
-   "self_type" : "type-223",
+   "referenced_type" : "_ZTIFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8587,8 +8407,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvE",
    "name" : "unsigned char (*)(_JNIEnv *)",
-   "referenced_type" : "type-515",
-   "self_type" : "type-514",
+   "referenced_type" : "_ZTIFhP7_JNIEnvE",
+   "self_type" : "_ZTIPFhP7_JNIEnvE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8596,8 +8416,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-250",
-   "self_type" : "type-249",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8605,8 +8425,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-248",
-   "self_type" : "type-247",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8614,8 +8434,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-246",
-   "self_type" : "type-245",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8623,8 +8443,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-302",
-   "self_type" : "type-301",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8632,8 +8452,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP7_jclassS2_E",
    "name" : "unsigned char (*)(_JNIEnv *, _jclass *, _jclass *)",
-   "referenced_type" : "type-43",
-   "self_type" : "type-42",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP7_jclassS2_E",
+   "self_type" : "_ZTIPFhP7_JNIEnvP7_jclassS2_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8641,8 +8461,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-98",
-   "self_type" : "type-97",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8650,8 +8470,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jmethodID *, char *)",
-   "referenced_type" : "type-96",
-   "self_type" : "type-95",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8659,8 +8479,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-94",
-   "self_type" : "type-93",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8668,8 +8488,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jclass *)",
-   "referenced_type" : "type-84",
-   "self_type" : "type-83",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8677,8 +8497,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-158",
-   "self_type" : "type-157",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8686,8 +8506,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-156",
-   "self_type" : "type-155",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8695,8 +8515,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-154",
-   "self_type" : "type-153",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8704,8 +8524,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-212",
-   "self_type" : "type-211",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8713,8 +8533,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFhP7_JNIEnvP8_jobjectS2_E",
    "name" : "unsigned char (*)(_JNIEnv *, _jobject *, _jobject *)",
-   "referenced_type" : "type-65",
-   "self_type" : "type-64",
+   "referenced_type" : "_ZTIFhP7_JNIEnvP8_jobjectS2_E",
+   "self_type" : "_ZTIPFhP7_JNIEnvP8_jobjectS2_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8722,8 +8542,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7AParcelPKvjE",
    "name" : "int (*)(AParcel *, const void *, unsigned int)",
-   "referenced_type" : "type-594",
-   "self_type" : "type-595",
+   "referenced_type" : "_ZTIFiP7AParcelPKvjE",
+   "self_type" : "_ZTIPFiP7AParcelPKvjE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8731,8 +8551,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvE",
    "name" : "int (*)(_JNIEnv *)",
-   "referenced_type" : "type-15",
-   "self_type" : "type-14",
+   "referenced_type" : "_ZTIFiP7_JNIEnvE",
+   "self_type" : "_ZTIPFiP7_JNIEnvE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8740,8 +8560,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP11_jthrowableE",
    "name" : "int (*)(_JNIEnv *, _jthrowable *)",
-   "referenced_type" : "type-47",
-   "self_type" : "type-46",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP11_jthrowableE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP11_jthrowableE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8749,8 +8569,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jarrayE",
    "name" : "int (*)(_JNIEnv *, _jarray *)",
-   "referenced_type" : "type-355",
-   "self_type" : "type-354",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jarrayE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jarrayE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8758,8 +8578,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassE",
    "name" : "int (*)(_JNIEnv *, _jclass *)",
-   "referenced_type" : "type-487",
-   "self_type" : "type-486",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8767,8 +8587,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "int (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-274",
-   "self_type" : "type-273",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8776,8 +8596,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "name" : "int (*)(_JNIEnv *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-272",
-   "self_type" : "type-271",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8785,8 +8605,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "int (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-270",
-   "self_type" : "type-269",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8794,8 +8614,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "int (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-310",
-   "self_type" : "type-309",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8803,8 +8623,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
    "name" : "int (*)(_JNIEnv *, _jclass *, const JNINativeMethod *, int)",
-   "referenced_type" : "type-482",
-   "self_type" : "type-481",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8812,8 +8632,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP7_jclassPKcE",
    "name" : "int (*)(_JNIEnv *, _jclass *, const char *)",
-   "referenced_type" : "type-51",
-   "self_type" : "type-50",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP7_jclassPKcE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP7_jclassPKcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8821,8 +8641,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectE",
    "name" : "int (*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-489",
-   "self_type" : "type-488",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8830,8 +8650,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-122",
-   "self_type" : "type-121",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8839,8 +8659,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jmethodID *, char *)",
-   "referenced_type" : "type-120",
-   "self_type" : "type-119",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8848,8 +8668,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-118",
-   "self_type" : "type-117",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8857,8 +8677,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-182",
-   "self_type" : "type-181",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8866,8 +8686,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-180",
-   "self_type" : "type-179",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8875,8 +8695,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-178",
-   "self_type" : "type-177",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8884,8 +8704,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "int (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-220",
-   "self_type" : "type-219",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8893,8 +8713,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvP8_jstringE",
    "name" : "int (*)(_JNIEnv *, _jstring *)",
-   "referenced_type" : "type-342",
-   "self_type" : "type-341",
+   "referenced_type" : "_ZTIFiP7_JNIEnvP8_jstringE",
+   "self_type" : "_ZTIPFiP7_JNIEnvP8_jstringE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8902,8 +8722,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnvPP7_JavaVME",
    "name" : "int (*)(_JNIEnv *, _JavaVM **)",
-   "referenced_type" : "type-491",
-   "self_type" : "type-490",
+   "referenced_type" : "_ZTIFiP7_JNIEnvPP7_JavaVME",
+   "self_type" : "_ZTIPFiP7_JNIEnvPP7_JavaVME",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8911,8 +8731,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JNIEnviE",
    "name" : "int (*)(_JNIEnv *, int)",
-   "referenced_type" : "type-59",
-   "self_type" : "type-58",
+   "referenced_type" : "_ZTIFiP7_JNIEnviE",
+   "self_type" : "_ZTIPFiP7_JNIEnviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8920,8 +8740,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JavaVME",
    "name" : "int (*)(_JavaVM *)",
-   "referenced_type" : "type-499",
-   "self_type" : "type-498",
+   "referenced_type" : "_ZTIFiP7_JavaVME",
+   "self_type" : "_ZTIPFiP7_JavaVME",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8929,8 +8749,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JavaVMPP7_JNIEnvPvE",
    "name" : "int (*)(_JavaVM *, _JNIEnv **, void *)",
-   "referenced_type" : "type-501",
-   "self_type" : "type-500",
+   "referenced_type" : "_ZTIFiP7_JavaVMPP7_JNIEnvPvE",
+   "self_type" : "_ZTIPFiP7_JavaVMPP7_JNIEnvPvE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8938,8 +8758,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP7_JavaVMPPviE",
    "name" : "int (*)(_JavaVM *, void **, int)",
-   "referenced_type" : "type-504",
-   "self_type" : "type-503",
+   "referenced_type" : "_ZTIFiP7_JavaVMPPviE",
+   "self_type" : "_ZTIPFiP7_JavaVMPPviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8947,8 +8767,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP8AIBinderiPPKcjE",
    "name" : "int (*)(AIBinder *, int, const char **, unsigned int)",
-   "referenced_type" : "type-550",
-   "self_type" : "type-552",
+   "referenced_type" : "_ZTIFiP8AIBinderiPPKcjE",
+   "self_type" : "_ZTIPFiP8AIBinderiPPKcjE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -8956,8 +8776,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP8AIBinderjPK7AParcelPS1_E",
    "name" : "int (*)(AIBinder *, unsigned int, const AParcel *, AParcel *)",
-   "referenced_type" : "type-547",
-   "self_type" : "type-546",
+   "referenced_type" : "_ZTIFiP8AIBinderjPK7AParcelPS1_E",
+   "self_type" : "_ZTIPFiP8AIBinderjPK7AParcelPS1_E",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -8965,8 +8785,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiPK7AParcelPvjE",
    "name" : "int (*)(const AParcel *, void *, unsigned int)",
-   "referenced_type" : "type-596",
-   "self_type" : "type-600",
+   "referenced_type" : "_ZTIFiPK7AParcelPvjE",
+   "self_type" : "_ZTIPFiPK7AParcelPvjE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -8974,8 +8794,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "short (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-268",
-   "self_type" : "type-267",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8983,8 +8803,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "name" : "short (*)(_JNIEnv *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-266",
-   "self_type" : "type-265",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -8992,8 +8812,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "short (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-264",
-   "self_type" : "type-263",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9001,8 +8821,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "short (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9010,8 +8830,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-116",
-   "self_type" : "type-115",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9019,8 +8839,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jmethodID *, char *)",
-   "referenced_type" : "type-114",
-   "self_type" : "type-113",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9028,8 +8848,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-112",
-   "self_type" : "type-111",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9037,8 +8857,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-176",
-   "self_type" : "type-175",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9046,8 +8866,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-174",
-   "self_type" : "type-173",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9055,8 +8875,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-172",
-   "self_type" : "type-171",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9064,8 +8884,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "short (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-218",
-   "self_type" : "type-217",
+   "referenced_type" : "_ZTIFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9073,8 +8893,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "unsigned short (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-262",
-   "self_type" : "type-261",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9082,8 +8902,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "name" : "unsigned short (*)(_JNIEnv *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-260",
-   "self_type" : "type-259",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9091,8 +8911,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "unsigned short (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-258",
-   "self_type" : "type-257",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9100,8 +8920,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "unsigned short (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-306",
-   "self_type" : "type-305",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9109,8 +8929,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-110",
-   "self_type" : "type-109",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9118,8 +8938,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jmethodID *, char *)",
-   "referenced_type" : "type-108",
-   "self_type" : "type-107",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9127,8 +8947,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-106",
-   "self_type" : "type-105",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9136,8 +8956,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-170",
-   "self_type" : "type-169",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9145,8 +8965,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-168",
-   "self_type" : "type-167",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9154,8 +8974,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-166",
-   "self_type" : "type-165",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9163,8 +8983,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "unsigned short (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-216",
-   "self_type" : "type-215",
+   "referenced_type" : "_ZTIFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9172,8 +8992,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvE",
    "name" : "void (*)(_JNIEnv *)",
-   "referenced_type" : "type-55",
-   "self_type" : "type-54",
+   "referenced_type" : "_ZTIFvP7_JNIEnvE",
+   "self_type" : "_ZTIPFvP7_JNIEnvE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9181,8 +9001,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP10_jintArrayPiiE",
    "name" : "void (*)(_JNIEnv *, _jintArray *, int *, int)",
-   "referenced_type" : "type-430",
-   "self_type" : "type-429",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayPiiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayPiiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9190,8 +9010,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPKiE",
    "name" : "void (*)(_JNIEnv *, _jintArray *, int, int, const int *)",
-   "referenced_type" : "type-466",
-   "self_type" : "type-465",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPKiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPKiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9199,8 +9019,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPiE",
    "name" : "void (*)(_JNIEnv *, _jintArray *, int, int, int *)",
-   "referenced_type" : "type-446",
-   "self_type" : "type-445",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP10_jintArrayiiPiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9208,8 +9028,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayPaiE",
    "name" : "void (*)(_JNIEnv *, _jbyteArray *, signed char *, int)",
-   "referenced_type" : "type-424",
-   "self_type" : "type-423",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayPaiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayPaiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9217,8 +9037,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPKaE",
    "name" : "void (*)(_JNIEnv *, _jbyteArray *, int, int, const signed char *)",
-   "referenced_type" : "type-458",
-   "self_type" : "type-457",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPKaE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPKaE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9226,8 +9046,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPaE",
    "name" : "void (*)(_JNIEnv *, _jbyteArray *, int, int, signed char *)",
-   "referenced_type" : "type-440",
-   "self_type" : "type-439",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jbyteArrayiiPaE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPaE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9235,8 +9055,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jcharArrayPtiE",
    "name" : "void (*)(_JNIEnv *, _jcharArray *, unsigned short *, int)",
-   "referenced_type" : "type-426",
-   "self_type" : "type-425",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayPtiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayPtiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9244,8 +9064,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPKtE",
    "name" : "void (*)(_JNIEnv *, _jcharArray *, int, int, const unsigned short *)",
-   "referenced_type" : "type-460",
-   "self_type" : "type-459",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPKtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPKtE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9253,8 +9073,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPtE",
    "name" : "void (*)(_JNIEnv *, _jcharArray *, int, int, unsigned short *)",
-   "referenced_type" : "type-442",
-   "self_type" : "type-441",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jcharArrayiiPtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPtE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9262,8 +9082,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jlongArrayPxiE",
    "name" : "void (*)(_JNIEnv *, _jlongArray *, long long *, int)",
-   "referenced_type" : "type-432",
-   "self_type" : "type-431",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayPxiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayPxiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9271,8 +9091,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPKxE",
    "name" : "void (*)(_JNIEnv *, _jlongArray *, int, int, const long long *)",
-   "referenced_type" : "type-470",
-   "self_type" : "type-469",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPKxE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPKxE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9280,8 +9100,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPxE",
    "name" : "void (*)(_JNIEnv *, _jlongArray *, int, int, long long *)",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP11_jlongArrayiiPxE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPxE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9289,8 +9109,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayPfiE",
    "name" : "void (*)(_JNIEnv *, _jfloatArray *, float *, int)",
-   "referenced_type" : "type-434",
-   "self_type" : "type-433",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayPfiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayPfiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9298,8 +9118,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPKfE",
    "name" : "void (*)(_JNIEnv *, _jfloatArray *, int, int, const float *)",
-   "referenced_type" : "type-474",
-   "self_type" : "type-473",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPKfE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPKfE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9307,8 +9127,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPfE",
    "name" : "void (*)(_JNIEnv *, _jfloatArray *, int, int, float *)",
-   "referenced_type" : "type-450",
-   "self_type" : "type-449",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jfloatArrayiiPfE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPfE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9316,8 +9136,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jshortArrayPsiE",
    "name" : "void (*)(_JNIEnv *, _jshortArray *, short *, int)",
-   "referenced_type" : "type-428",
-   "self_type" : "type-427",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayPsiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayPsiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9325,8 +9145,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPKsE",
    "name" : "void (*)(_JNIEnv *, _jshortArray *, int, int, const short *)",
-   "referenced_type" : "type-462",
-   "self_type" : "type-461",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPKsE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPKsE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9334,8 +9154,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPsE",
    "name" : "void (*)(_JNIEnv *, _jshortArray *, int, int, short *)",
-   "referenced_type" : "type-444",
-   "self_type" : "type-443",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP12_jshortArrayiiPsE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPsE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9343,8 +9163,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayPdiE",
    "name" : "void (*)(_JNIEnv *, _jdoubleArray *, double *, int)",
-   "referenced_type" : "type-436",
-   "self_type" : "type-435",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayPdiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayPdiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9352,8 +9172,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
    "name" : "void (*)(_JNIEnv *, _jdoubleArray *, int, int, const double *)",
-   "referenced_type" : "type-478",
-   "self_type" : "type-477",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPKdE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9361,8 +9181,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPdE",
    "name" : "void (*)(_JNIEnv *, _jdoubleArray *, int, int, double *)",
-   "referenced_type" : "type-452",
-   "self_type" : "type-451",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jdoubleArrayiiPdE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPdE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9370,8 +9190,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
    "name" : "void (*)(_JNIEnv *, _jobjectArray *, int, _jobject *)",
-   "referenced_type" : "type-365",
-   "self_type" : "type-364",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9379,8 +9199,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayPhiE",
    "name" : "void (*)(_JNIEnv *, _jbooleanArray *, unsigned char *, int)",
-   "referenced_type" : "type-422",
-   "self_type" : "type-421",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayPhiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayPhiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9388,8 +9208,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
    "name" : "void (*)(_JNIEnv *, _jbooleanArray *, int, int, const unsigned char *)",
-   "referenced_type" : "type-454",
-   "self_type" : "type-453",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPKhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9397,8 +9217,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPhE",
    "name" : "void (*)(_JNIEnv *, _jbooleanArray *, int, int, unsigned char *)",
-   "referenced_type" : "type-438",
-   "self_type" : "type-437",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP14_jbooleanArrayiiPhE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9406,8 +9226,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jarrayPviE",
    "name" : "void (*)(_JNIEnv *, _jarray *, void *, int)",
-   "referenced_type" : "type-513",
-   "self_type" : "type-512",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jarrayPviE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jarrayPviE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9415,8 +9235,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-298",
-   "self_type" : "type-297",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9424,8 +9244,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-296",
-   "self_type" : "type-295",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9433,8 +9253,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-294",
-   "self_type" : "type-293",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9442,8 +9262,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, _jobject *)",
-   "referenced_type" : "type-318",
-   "self_type" : "type-317",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9451,8 +9271,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, signed char)",
-   "referenced_type" : "type-322",
-   "self_type" : "type-321",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDaE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9460,8 +9280,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, double)",
-   "referenced_type" : "type-334",
-   "self_type" : "type-333",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDdE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9469,8 +9289,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, float)",
-   "referenced_type" : "type-332",
-   "self_type" : "type-331",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDfE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9478,8 +9298,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, unsigned char)",
-   "referenced_type" : "type-320",
-   "self_type" : "type-319",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9487,8 +9307,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, int)",
-   "referenced_type" : "type-328",
-   "self_type" : "type-327",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9496,8 +9316,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, short)",
-   "referenced_type" : "type-326",
-   "self_type" : "type-325",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDsE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9505,8 +9325,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, unsigned short)",
-   "referenced_type" : "type-324",
-   "self_type" : "type-323",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDtE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9514,8 +9334,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDxE",
    "name" : "void (*)(_JNIEnv *, _jclass *, _jfieldID *, long long)",
-   "referenced_type" : "type-330",
-   "self_type" : "type-329",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP7_jclassP9_jfieldIDxE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDxE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9523,8 +9343,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectE",
    "name" : "void (*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9532,8 +9352,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-146",
-   "self_type" : "type-145",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9541,8 +9361,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jmethodID *, char *)",
-   "referenced_type" : "type-144",
-   "self_type" : "type-143",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9550,8 +9370,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-142",
-   "self_type" : "type-141",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9559,8 +9379,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-206",
-   "self_type" : "type-205",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9568,8 +9388,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-204",
-   "self_type" : "type-203",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9577,8 +9397,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-202",
-   "self_type" : "type-201",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9586,8 +9406,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, _jobject *)",
-   "referenced_type" : "type-228",
-   "self_type" : "type-227",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9595,8 +9415,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, signed char)",
-   "referenced_type" : "type-232",
-   "self_type" : "type-231",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDaE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9604,8 +9424,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, double)",
-   "referenced_type" : "type-244",
-   "self_type" : "type-243",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDdE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9613,8 +9433,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, float)",
-   "referenced_type" : "type-242",
-   "self_type" : "type-241",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDfE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9622,8 +9442,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, unsigned char)",
-   "referenced_type" : "type-230",
-   "self_type" : "type-229",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDhE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9631,8 +9451,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, int)",
-   "referenced_type" : "type-238",
-   "self_type" : "type-237",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDiE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9640,8 +9460,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, short)",
-   "referenced_type" : "type-236",
-   "self_type" : "type-235",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDsE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9649,8 +9469,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, unsigned short)",
-   "referenced_type" : "type-234",
-   "self_type" : "type-233",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDtE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9658,8 +9478,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDxE",
    "name" : "void (*)(_JNIEnv *, _jobject *, _jfieldID *, long long)",
-   "referenced_type" : "type-240",
-   "self_type" : "type-239",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jobjectP9_jfieldIDxE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDxE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9667,8 +9487,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jstringPKcE",
    "name" : "void (*)(_JNIEnv *, _jstring *, const char *)",
-   "referenced_type" : "type-353",
-   "self_type" : "type-352",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringPKcE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9676,8 +9496,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jstringPKtE",
    "name" : "void (*)(_JNIEnv *, _jstring *, const unsigned short *)",
-   "referenced_type" : "type-347",
-   "self_type" : "type-346",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringPKtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKtE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9685,8 +9505,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jstringiiPcE",
    "name" : "void (*)(_JNIEnv *, _jstring *, int, int, char *)",
-   "referenced_type" : "type-509",
-   "self_type" : "type-508",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPcE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jstringiiPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9694,8 +9514,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvP8_jstringiiPtE",
    "name" : "void (*)(_JNIEnv *, _jstring *, int, int, unsigned short *)",
-   "referenced_type" : "type-507",
-   "self_type" : "type-506",
+   "referenced_type" : "_ZTIFvP7_JNIEnvP8_jstringiiPtE",
+   "self_type" : "_ZTIPFvP7_JNIEnvP8_jstringiiPtE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9703,8 +9523,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvP7_JNIEnvPKcE",
    "name" : "void (*)(_JNIEnv *, const char *)",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "_ZTIFvP7_JNIEnvPKcE",
+   "self_type" : "_ZTIPFvP7_JNIEnvPKcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9712,8 +9532,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvPvE",
    "name" : "void (*)(void *)",
-   "referenced_type" : "type-559",
-   "self_type" : "type-605",
+   "referenced_type" : "_ZTIFvPvE",
+   "self_type" : "_ZTIPFvPvE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9721,8 +9541,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvPvjbE",
    "name" : "void (*)(void *, unsigned int, bool)",
-   "referenced_type" : "type-636",
-   "self_type" : "type-637",
+   "referenced_type" : "_ZTIFvPvjbE",
+   "self_type" : "_ZTIPFvPvjbE",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -9730,8 +9550,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "long long (*)(_JNIEnv *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-280",
-   "self_type" : "type-279",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9739,8 +9559,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "name" : "long long (*)(_JNIEnv *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-278",
-   "self_type" : "type-277",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9748,8 +9568,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "name" : "long long (*)(_JNIEnv *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-276",
-   "self_type" : "type-275",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9757,8 +9577,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP7_jclassP9_jfieldIDE",
    "name" : "long long (*)(_JNIEnv *, _jclass *, _jfieldID *)",
-   "referenced_type" : "type-312",
-   "self_type" : "type-311",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP7_jclassP9_jfieldIDE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP7_jclassP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9766,8 +9586,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectE",
    "name" : "long long (*)(_JNIEnv *, _jobject *)",
-   "referenced_type" : "type-521",
-   "self_type" : "type-520",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9775,8 +9595,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "name" : "long long (*)(_JNIEnv *, _jobject *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-128",
-   "self_type" : "type-127",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9784,8 +9604,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "name" : "long long (*)(_JNIEnv *, _jobject *, _jmethodID *, char *)",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9793,8 +9613,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "name" : "long long (*)(_JNIEnv *, _jobject *, _jmethodID *, ...)",
-   "referenced_type" : "type-124",
-   "self_type" : "type-123",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP10_jmethodIDzE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9802,8 +9622,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "name" : "long long (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, const jvalue *)",
-   "referenced_type" : "type-188",
-   "self_type" : "type-187",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9811,8 +9631,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "name" : "long long (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, char *)",
-   "referenced_type" : "type-186",
-   "self_type" : "type-185",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9820,8 +9640,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "name" : "long long (*)(_JNIEnv *, _jobject *, _jclass *, _jmethodID *, ...)",
-   "referenced_type" : "type-184",
-   "self_type" : "type-183",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9829,8 +9649,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFxP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "name" : "long long (*)(_JNIEnv *, _jobject *, _jfieldID *)",
-   "referenced_type" : "type-222",
-   "self_type" : "type-221",
+   "referenced_type" : "_ZTIFxP7_JNIEnvP8_jobjectP9_jfieldIDE",
+   "self_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP9_jfieldIDE",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9838,8 +9658,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK14AIBinder_Class",
    "name" : "const AIBinder_Class *",
-   "referenced_type" : "type-553",
-   "self_type" : "type-555",
+   "referenced_type" : "_ZTIK14AIBinder_Class",
+   "self_type" : "_ZTIPK14AIBinder_Class",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9847,8 +9667,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK14AIBinder_Class",
    "name" : "const AIBinder_Class *",
-   "referenced_type" : "type-663",
-   "self_type" : "type-665",
+   "referenced_type" : "_ZTIK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPK14AIBinder_Class#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9856,8 +9676,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK15JNINativeMethod",
    "name" : "const JNINativeMethod *",
-   "referenced_type" : "type-484",
-   "self_type" : "type-483",
+   "referenced_type" : "_ZTIK15JNINativeMethod",
+   "self_type" : "_ZTIPK15JNINativeMethod",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9865,8 +9685,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK18JNIInvokeInterface",
    "name" : "const JNIInvokeInterface *",
-   "referenced_type" : "type-496",
-   "self_type" : "type-495",
+   "referenced_type" : "_ZTIK18JNIInvokeInterface",
+   "self_type" : "_ZTIPK18JNIInvokeInterface",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9874,8 +9694,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK18JNINativeInterface",
    "name" : "const JNINativeInterface *",
-   "referenced_type" : "type-10",
-   "self_type" : "type-9",
+   "referenced_type" : "_ZTIK18JNINativeInterface",
+   "self_type" : "_ZTIPK18JNINativeInterface",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9883,8 +9703,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK6jvalue",
    "name" : "const jvalue *",
-   "referenced_type" : "type-74",
-   "self_type" : "type-73",
+   "referenced_type" : "_ZTIK6jvalue",
+   "self_type" : "_ZTIPK6jvalue",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -9892,17 +9712,17 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AParcel",
    "name" : "const AParcel *",
-   "referenced_type" : "type-527",
-   "self_type" : "type-526",
+   "referenced_type" : "_ZTIK7AParcel",
+   "self_type" : "_ZTIPK7AParcel",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AParcel",
    "name" : "const AParcel *",
-   "referenced_type" : "type-542",
-   "self_type" : "type-541",
+   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9910,35 +9730,26 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AParcel",
    "name" : "const AParcel *",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
+   "referenced_type" : "_ZTIK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
+   "self_type" : "_ZTIPK7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AParcel",
-   "name" : "const AParcel *",
-   "referenced_type" : "type-658",
-   "self_type" : "type-660",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AStatus",
    "name" : "const AStatus *",
-   "referenced_type" : "type-536",
-   "self_type" : "type-538",
+   "referenced_type" : "_ZTIK7AStatus",
+   "self_type" : "_ZTIPK7AStatus",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AStatus",
    "name" : "const AStatus *",
-   "referenced_type" : "type-575",
-   "self_type" : "type-577",
+   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
+   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -9946,26 +9757,17 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK7AStatus",
    "name" : "const AStatus *",
-   "referenced_type" : "type-649",
-   "self_type" : "type-651",
+   "referenced_type" : "_ZTIK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
+   "self_type" : "_ZTIPK7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/status.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK7AStatus",
-   "name" : "const AStatus *",
-   "referenced_type" : "type-681",
-   "self_type" : "type-683",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK8AIBinder",
    "name" : "const AIBinder *",
-   "referenced_type" : "type-557",
-   "self_type" : "type-560",
+   "referenced_type" : "_ZTIK8AIBinder",
+   "self_type" : "_ZTIPK8AIBinder",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9973,8 +9775,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK8AIBinder",
    "name" : "const AIBinder *",
-   "referenced_type" : "type-666",
-   "self_type" : "type-668",
+   "referenced_type" : "_ZTIK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPK8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -9982,8 +9784,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKDs",
    "name" : "const char16_t *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-615",
+   "referenced_type" : "_ZTIKDs",
+   "self_type" : "_ZTIPKDs",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -9991,8 +9793,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKa",
    "name" : "const signed char *",
-   "referenced_type" : "type-25",
-   "self_type" : "type-24",
+   "referenced_type" : "_ZTIKa",
+   "self_type" : "_ZTIPKa",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10000,8 +9802,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKc",
    "name" : "const char *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
+   "referenced_type" : "_ZTIKc",
+   "self_type" : "_ZTIPKc",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10009,8 +9811,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKd",
    "name" : "const double *",
-   "referenced_type" : "type-480",
-   "self_type" : "type-479",
+   "referenced_type" : "_ZTIKd",
+   "self_type" : "_ZTIPKd",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10018,8 +9820,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKf",
    "name" : "const float *",
-   "referenced_type" : "type-476",
-   "self_type" : "type-475",
+   "referenced_type" : "_ZTIKf",
+   "self_type" : "_ZTIPKf",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10027,8 +9829,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKh",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-456",
-   "self_type" : "type-455",
+   "referenced_type" : "_ZTIKh",
+   "self_type" : "_ZTIPKh",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10036,8 +9838,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKi",
    "name" : "const int *",
-   "referenced_type" : "type-468",
-   "self_type" : "type-467",
+   "referenced_type" : "_ZTIKi",
+   "self_type" : "_ZTIPKi",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10045,8 +9847,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKj",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-608",
-   "self_type" : "type-609",
+   "referenced_type" : "_ZTIKj",
+   "self_type" : "_ZTIPKj",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10054,8 +9856,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKs",
    "name" : "const short *",
-   "referenced_type" : "type-464",
-   "self_type" : "type-463",
+   "referenced_type" : "_ZTIKs",
+   "self_type" : "_ZTIPKs",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10063,8 +9865,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKt",
    "name" : "const unsigned short *",
-   "referenced_type" : "type-340",
-   "self_type" : "type-339",
+   "referenced_type" : "_ZTIKt",
+   "self_type" : "_ZTIPKt",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10072,8 +9874,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKv",
    "name" : "const void *",
-   "referenced_type" : "type-584",
-   "self_type" : "type-585",
+   "referenced_type" : "_ZTIKv",
+   "self_type" : "_ZTIPKv",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10081,8 +9883,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKx",
    "name" : "const long long *",
-   "referenced_type" : "type-472",
-   "self_type" : "type-471",
+   "referenced_type" : "_ZTIKx",
+   "self_type" : "_ZTIPKx",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10090,8 +9892,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKy",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-610",
-   "self_type" : "type-611",
+   "referenced_type" : "_ZTIKy",
+   "self_type" : "_ZTIPKy",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10099,8 +9901,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP7AParcel",
    "name" : "AParcel **",
-   "referenced_type" : "type-544",
-   "self_type" : "type-563",
+   "referenced_type" : "_ZTIP7AParcel",
+   "self_type" : "_ZTIPP7AParcel",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10108,8 +9910,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP7AParcel",
    "name" : "AParcel **",
-   "referenced_type" : "type-661",
-   "self_type" : "type-671",
+   "referenced_type" : "_ZTIP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPP7AParcel#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10117,8 +9919,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP7AStatus",
    "name" : "AStatus **",
-   "referenced_type" : "type-578",
-   "self_type" : "type-580",
+   "referenced_type" : "_ZTIP7AStatus",
+   "self_type" : "_ZTIPP7AStatus",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10126,8 +9928,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP7AStatus",
    "name" : "AStatus **",
-   "referenced_type" : "type-684",
-   "self_type" : "type-686",
+   "referenced_type" : "_ZTIP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
+   "self_type" : "_ZTIPP7AStatus#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10135,8 +9937,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP7_JNIEnv",
    "name" : "_JNIEnv **",
-   "referenced_type" : "type-7",
-   "self_type" : "type-502",
+   "referenced_type" : "_ZTIP7_JNIEnv",
+   "self_type" : "_ZTIPP7_JNIEnv",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10144,8 +9946,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP7_JavaVM",
    "name" : "_JavaVM **",
-   "referenced_type" : "type-493",
-   "self_type" : "type-492",
+   "referenced_type" : "_ZTIP7_JavaVM",
+   "self_type" : "_ZTIPP7_JavaVM",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10153,17 +9955,17 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP8AIBinder",
    "name" : "AIBinder **",
-   "referenced_type" : "type-529",
-   "self_type" : "type-531",
+   "referenced_type" : "_ZTIP8AIBinder",
+   "self_type" : "_ZTIPP8AIBinder",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
+   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP8AIBinder",
    "name" : "AIBinder **",
-   "referenced_type" : "type-548",
-   "self_type" : "type-566",
+   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
+   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/ibinder.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10171,26 +9973,17 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPP8AIBinder",
    "name" : "AIBinder **",
-   "referenced_type" : "type-627",
-   "self_type" : "type-638",
+   "referenced_type" : "_ZTIP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
+   "self_type" : "_ZTIPP8AIBinder#ODR:out/soong/.intermediates/frameworks/native/libs/binder/ndk/libbinder_ndk/android_x86_x86_64_shared/obj/frameworks/native/libs/binder/ndk/parcel.sdump",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPP8AIBinder",
-   "name" : "AIBinder **",
-   "referenced_type" : "type-656",
-   "self_type" : "type-674",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPPDs",
    "name" : "char16_t **",
-   "referenced_type" : "type-607",
-   "self_type" : "type-640",
+   "referenced_type" : "_ZTIPDs",
+   "self_type" : "_ZTIPPDs",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10198,8 +9991,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPKc",
    "name" : "const char **",
-   "referenced_type" : "type-21",
-   "self_type" : "type-551",
+   "referenced_type" : "_ZTIPKc",
+   "self_type" : "_ZTIPPKc",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10207,8 +10000,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPa",
    "name" : "signed char **",
-   "referenced_type" : "type-402",
-   "self_type" : "type-643",
+   "referenced_type" : "_ZTIPa",
+   "self_type" : "_ZTIPPa",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10216,8 +10009,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPc",
    "name" : "char **",
-   "referenced_type" : "type-70",
-   "self_type" : "type-582",
+   "referenced_type" : "_ZTIPc",
+   "self_type" : "_ZTIPPc",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10225,8 +10018,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPd",
    "name" : "double **",
-   "referenced_type" : "type-420",
-   "self_type" : "type-634",
+   "referenced_type" : "_ZTIPd",
+   "self_type" : "_ZTIPPd",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10234,8 +10027,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPf",
    "name" : "float **",
-   "referenced_type" : "type-417",
-   "self_type" : "type-631",
+   "referenced_type" : "_ZTIPf",
+   "self_type" : "_ZTIPPf",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10243,8 +10036,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPi",
    "name" : "int **",
-   "referenced_type" : "type-411",
-   "self_type" : "type-617",
+   "referenced_type" : "_ZTIPi",
+   "self_type" : "_ZTIPPi",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10252,8 +10045,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPj",
    "name" : "unsigned int **",
-   "referenced_type" : "type-603",
-   "self_type" : "type-620",
+   "referenced_type" : "_ZTIPj",
+   "self_type" : "_ZTIPPj",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10261,8 +10054,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPv",
    "name" : "void **",
-   "referenced_type" : "type-12",
-   "self_type" : "type-505",
+   "referenced_type" : "_ZTIPv",
+   "self_type" : "_ZTIPPv",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10270,8 +10063,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPx",
    "name" : "long long **",
-   "referenced_type" : "type-414",
-   "self_type" : "type-623",
+   "referenced_type" : "_ZTIPx",
+   "self_type" : "_ZTIPPx",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10279,8 +10072,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPPy",
    "name" : "unsigned long long **",
-   "referenced_type" : "type-604",
-   "self_type" : "type-626",
+   "referenced_type" : "_ZTIPy",
+   "self_type" : "_ZTIPPy",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10288,8 +10081,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPa",
    "name" : "signed char *",
-   "referenced_type" : "type-26",
-   "self_type" : "type-402",
+   "referenced_type" : "_ZTIa",
+   "self_type" : "_ZTIPa",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10297,8 +10090,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPb",
    "name" : "bool *",
-   "referenced_type" : "type-556",
-   "self_type" : "type-606",
+   "referenced_type" : "_ZTIb",
+   "self_type" : "_ZTIPb",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10306,8 +10099,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPc",
    "name" : "char *",
-   "referenced_type" : "type-23",
-   "self_type" : "type-70",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIPc",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10315,8 +10108,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPd",
    "name" : "double *",
-   "referenced_type" : "type-80",
-   "self_type" : "type-420",
+   "referenced_type" : "_ZTId",
+   "self_type" : "_ZTIPd",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10324,8 +10117,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPf",
    "name" : "float *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-417",
+   "referenced_type" : "_ZTIf",
+   "self_type" : "_ZTIPf",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10333,8 +10126,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPh",
    "name" : "unsigned char *",
-   "referenced_type" : "type-39",
-   "self_type" : "type-345",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIPh",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10342,8 +10135,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPi",
    "name" : "int *",
-   "referenced_type" : "type-16",
-   "self_type" : "type-411",
+   "referenced_type" : "_ZTIi",
+   "self_type" : "_ZTIPi",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10351,8 +10144,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPj",
    "name" : "unsigned int *",
-   "referenced_type" : "type-525",
-   "self_type" : "type-603",
+   "referenced_type" : "_ZTIj",
+   "self_type" : "_ZTIPj",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10360,8 +10153,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPs",
    "name" : "short *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-408",
+   "referenced_type" : "_ZTIs",
+   "self_type" : "_ZTIPs",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10369,8 +10162,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPt",
    "name" : "unsigned short *",
-   "referenced_type" : "type-76",
-   "self_type" : "type-405",
+   "referenced_type" : "_ZTIt",
+   "self_type" : "_ZTIPt",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10378,8 +10171,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPv",
    "name" : "void *",
-   "referenced_type" : "type-13",
-   "self_type" : "type-12",
+   "referenced_type" : "_ZTIv",
+   "self_type" : "_ZTIPv",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10387,8 +10180,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPx",
    "name" : "long long *",
-   "referenced_type" : "type-78",
-   "self_type" : "type-414",
+   "referenced_type" : "_ZTIx",
+   "self_type" : "_ZTIPx",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10396,8 +10189,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPy",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-601",
-   "self_type" : "type-604",
+   "referenced_type" : "_ZTIy",
+   "self_type" : "_ZTIPy",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   }
@@ -10409,18 +10202,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK14AIBinder_Class",
    "name" : "const AIBinder_Class",
-   "referenced_type" : "type-554",
-   "self_type" : "type-553",
-   "size" : 20,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK14AIBinder_Class",
-   "name" : "const AIBinder_Class",
-   "referenced_type" : "type-664",
-   "self_type" : "type-663",
+   "referenced_type" : "_ZTI14AIBinder_Class",
+   "self_type" : "_ZTIK14AIBinder_Class",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10429,8 +10212,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK15JNINativeMethod",
    "name" : "const JNINativeMethod",
-   "referenced_type" : "type-485",
-   "self_type" : "type-484",
+   "referenced_type" : "_ZTI15JNINativeMethod",
+   "self_type" : "_ZTIK15JNINativeMethod",
    "size" : 12,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10439,8 +10222,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK18JNIInvokeInterface",
    "name" : "const JNIInvokeInterface",
-   "referenced_type" : "type-497",
-   "self_type" : "type-496",
+   "referenced_type" : "_ZTI18JNIInvokeInterface",
+   "self_type" : "_ZTIK18JNIInvokeInterface",
    "size" : 32,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10449,8 +10232,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK18JNINativeInterface",
    "name" : "const JNINativeInterface",
-   "referenced_type" : "type-11",
-   "self_type" : "type-10",
+   "referenced_type" : "_ZTI18JNINativeInterface",
+   "self_type" : "_ZTIK18JNINativeInterface",
    "size" : 932,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10459,8 +10242,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK6jvalue",
    "name" : "const jvalue",
-   "referenced_type" : "type-75",
-   "self_type" : "type-74",
+   "referenced_type" : "_ZTI6jvalue",
+   "self_type" : "_ZTIK6jvalue",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10469,38 +10252,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK7AParcel",
    "name" : "const AParcel",
-   "referenced_type" : "type-528",
-   "self_type" : "type-527",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AParcel",
-   "name" : "const AParcel",
-   "referenced_type" : "type-543",
-   "self_type" : "type-542",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AParcel",
-   "name" : "const AParcel",
-   "referenced_type" : "type-599",
-   "self_type" : "type-598",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AParcel",
-   "name" : "const AParcel",
-   "referenced_type" : "type-659",
-   "self_type" : "type-658",
+   "referenced_type" : "_ZTI7AParcel",
+   "self_type" : "_ZTIK7AParcel",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10509,38 +10262,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK7AStatus",
    "name" : "const AStatus",
-   "referenced_type" : "type-537",
-   "self_type" : "type-536",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AStatus",
-   "name" : "const AStatus",
-   "referenced_type" : "type-576",
-   "self_type" : "type-575",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AStatus",
-   "name" : "const AStatus",
-   "referenced_type" : "type-650",
-   "self_type" : "type-649",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK7AStatus",
-   "name" : "const AStatus",
-   "referenced_type" : "type-682",
-   "self_type" : "type-681",
+   "referenced_type" : "_ZTI7AStatus",
+   "self_type" : "_ZTIK7AStatus",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10549,18 +10272,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK8AIBinder",
    "name" : "const AIBinder",
-   "referenced_type" : "type-558",
-   "self_type" : "type-557",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK8AIBinder",
-   "name" : "const AIBinder",
-   "referenced_type" : "type-667",
-   "self_type" : "type-666",
+   "referenced_type" : "_ZTI8AIBinder",
+   "self_type" : "_ZTIK8AIBinder",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10569,8 +10282,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKDs",
    "name" : "const char16_t",
-   "referenced_type" : "type-602",
-   "self_type" : "type-614",
+   "referenced_type" : "_ZTIDs",
+   "self_type" : "_ZTIKDs",
    "size" : 2,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10579,8 +10292,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKa",
    "name" : "const signed char",
-   "referenced_type" : "type-26",
-   "self_type" : "type-25",
+   "referenced_type" : "_ZTIa",
+   "self_type" : "_ZTIKa",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10589,8 +10302,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKc",
    "name" : "const char",
-   "referenced_type" : "type-23",
-   "self_type" : "type-22",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIKc",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h"
   },
@@ -10599,8 +10312,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKd",
    "name" : "const double",
-   "referenced_type" : "type-80",
-   "self_type" : "type-480",
+   "referenced_type" : "_ZTId",
+   "self_type" : "_ZTIKd",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10609,8 +10322,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKf",
    "name" : "const float",
-   "referenced_type" : "type-79",
-   "self_type" : "type-476",
+   "referenced_type" : "_ZTIf",
+   "self_type" : "_ZTIKf",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10619,8 +10332,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKh",
    "name" : "const unsigned char",
-   "referenced_type" : "type-39",
-   "self_type" : "type-456",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIKh",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10629,8 +10342,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKi",
    "name" : "const int",
-   "referenced_type" : "type-16",
-   "self_type" : "type-468",
+   "referenced_type" : "_ZTIi",
+   "self_type" : "_ZTIKi",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10639,8 +10352,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKj",
    "name" : "const unsigned int",
-   "referenced_type" : "type-525",
-   "self_type" : "type-608",
+   "referenced_type" : "_ZTIj",
+   "self_type" : "_ZTIKj",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
@@ -10649,8 +10362,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKs",
    "name" : "const short",
-   "referenced_type" : "type-77",
-   "self_type" : "type-464",
+   "referenced_type" : "_ZTIs",
+   "self_type" : "_ZTIKs",
    "size" : 2,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10659,8 +10372,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKt",
    "name" : "const unsigned short",
-   "referenced_type" : "type-76",
-   "self_type" : "type-340",
+   "referenced_type" : "_ZTIt",
+   "self_type" : "_ZTIKt",
    "size" : 2,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10668,8 +10381,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKv",
    "name" : "const void",
-   "referenced_type" : "type-13",
-   "self_type" : "type-584",
+   "referenced_type" : "_ZTIv",
+   "self_type" : "_ZTIKv",
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   },
   {
@@ -10677,8 +10390,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKx",
    "name" : "const long long",
-   "referenced_type" : "type-78",
-   "self_type" : "type-472",
+   "referenced_type" : "_ZTIx",
+   "self_type" : "_ZTIKx",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10687,8 +10400,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKy",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-601",
-   "self_type" : "type-610",
+   "referenced_type" : "_ZTIy",
+   "self_type" : "_ZTIKy",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/ndk/include_ndk/android/binder_parcel.h"
   }
@@ -10700,14 +10413,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-357"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI10_jintArray",
    "name" : "_jintArray",
    "record_kind" : "class",
-   "referenced_type" : "type-385",
-   "self_type" : "type-385",
+   "referenced_type" : "_ZTI10_jintArray",
+   "self_type" : "_ZTI10_jintArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10716,14 +10429,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-357"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI11_jbyteArray",
    "name" : "_jbyteArray",
    "record_kind" : "class",
-   "referenced_type" : "type-373",
-   "self_type" : "type-373",
+   "referenced_type" : "_ZTI11_jbyteArray",
+   "self_type" : "_ZTI11_jbyteArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10732,14 +10445,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-357"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI11_jcharArray",
    "name" : "_jcharArray",
    "record_kind" : "class",
-   "referenced_type" : "type-377",
-   "self_type" : "type-377",
+   "referenced_type" : "_ZTI11_jcharArray",
+   "self_type" : "_ZTI11_jcharArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10748,14 +10461,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-357"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI11_jlongArray",
    "name" : "_jlongArray",
    "record_kind" : "class",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "_ZTI11_jlongArray",
+   "self_type" : "_ZTI11_jlongArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10764,14 +10477,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTI8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI11_jthrowable",
    "name" : "_jthrowable",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "_ZTI11_jthrowable",
+   "self_type" : "_ZTI11_jthrowable",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10781,18 +10494,18 @@
    [
     {
      "field_name" : "optionString",
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "field_name" : "extraInfo",
      "field_offset" : 32,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
    "linker_set_key" : "_ZTI12JavaVMOption",
    "name" : "JavaVMOption",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
+   "referenced_type" : "_ZTI12JavaVMOption",
+   "self_type" : "_ZTI12JavaVMOption",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10801,14 +10514,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-357"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI12_jfloatArray",
    "name" : "_jfloatArray",
    "record_kind" : "class",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
+   "referenced_type" : "_ZTI12_jfloatArray",
+   "self_type" : "_ZTI12_jfloatArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10817,14 +10530,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-357"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI12_jshortArray",
    "name" : "_jshortArray",
    "record_kind" : "class",
-   "referenced_type" : "type-381",
-   "self_type" : "type-381",
+   "referenced_type" : "_ZTI12_jshortArray",
+   "self_type" : "_ZTI12_jshortArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10833,14 +10546,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-357"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI13_jdoubleArray",
    "name" : "_jdoubleArray",
    "record_kind" : "class",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
+   "referenced_type" : "_ZTI13_jdoubleArray",
+   "self_type" : "_ZTI13_jdoubleArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10849,14 +10562,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-357"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI13_jobjectArray",
    "name" : "_jobjectArray",
    "record_kind" : "class",
-   "referenced_type" : "type-361",
-   "self_type" : "type-361",
+   "referenced_type" : "_ZTI13_jobjectArray",
+   "self_type" : "_ZTI13_jobjectArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10866,28 +10579,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "nOptions",
      "field_offset" : 32,
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "options",
      "field_offset" : 64,
-     "referenced_type" : "type-572"
+     "referenced_type" : "_ZTIP12JavaVMOption"
     },
     {
      "field_name" : "ignoreUnrecognized",
      "field_offset" : 96,
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     }
    ],
    "linker_set_key" : "_ZTI14JavaVMInitArgs",
    "name" : "JavaVMInitArgs",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
+   "referenced_type" : "_ZTI14JavaVMInitArgs",
+   "self_type" : "_ZTI14JavaVMInitArgs",
    "size" : 16,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10896,14 +10609,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-357"
+     "referenced_type" : "_ZTI7_jarray"
     }
    ],
    "linker_set_key" : "_ZTI14_jbooleanArray",
    "name" : "_jbooleanArray",
    "record_kind" : "class",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "_ZTI14_jbooleanArray",
+   "self_type" : "_ZTI14_jbooleanArray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10913,23 +10626,23 @@
    [
     {
      "field_name" : "name",
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "field_name" : "signature",
      "field_offset" : 32,
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "field_name" : "fnPtr",
      "field_offset" : 64,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     }
    ],
    "linker_set_key" : "_ZTI15JNINativeMethod",
    "name" : "JNINativeMethod",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
+   "referenced_type" : "_ZTI15JNINativeMethod",
+   "self_type" : "_ZTI15JNINativeMethod",
    "size" : 12,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10939,23 +10652,23 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "name",
      "field_offset" : 32,
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "field_name" : "group",
      "field_offset" : 64,
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI16JavaVMAttachArgs",
    "name" : "JavaVMAttachArgs",
-   "referenced_type" : "type-569",
-   "self_type" : "type-569",
+   "referenced_type" : "_ZTI16JavaVMAttachArgs",
+   "self_type" : "_ZTI16JavaVMAttachArgs",
    "size" : 12,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -10965,48 +10678,48 @@
    [
     {
      "field_name" : "reserved0",
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved1",
      "field_offset" : 32,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved2",
      "field_offset" : 64,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "DestroyJavaVM",
      "field_offset" : 96,
-     "referenced_type" : "type-498"
+     "referenced_type" : "_ZTIPFiP7_JavaVME"
     },
     {
      "field_name" : "AttachCurrentThread",
      "field_offset" : 128,
-     "referenced_type" : "type-500"
+     "referenced_type" : "_ZTIPFiP7_JavaVMPP7_JNIEnvPvE"
     },
     {
      "field_name" : "DetachCurrentThread",
      "field_offset" : 160,
-     "referenced_type" : "type-498"
+     "referenced_type" : "_ZTIPFiP7_JavaVME"
     },
     {
      "field_name" : "GetEnv",
      "field_offset" : 192,
-     "referenced_type" : "type-503"
+     "referenced_type" : "_ZTIPFiP7_JavaVMPPviE"
     },
     {
      "field_name" : "AttachCurrentThreadAsDaemon",
      "field_offset" : 224,
-     "referenced_type" : "type-500"
+     "referenced_type" : "_ZTIPFiP7_JavaVMPP7_JNIEnvPvE"
     }
    ],
    "linker_set_key" : "_ZTI18JNIInvokeInterface",
    "name" : "JNIInvokeInterface",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "_ZTI18JNIInvokeInterface",
+   "self_type" : "_ZTI18JNIInvokeInterface",
    "size" : 32,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -11016,1173 +10729,1173 @@
    [
     {
      "field_name" : "reserved0",
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved1",
      "field_offset" : 32,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved2",
      "field_offset" : 64,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "reserved3",
      "field_offset" : 96,
-     "referenced_type" : "type-12"
+     "referenced_type" : "_ZTIPv"
     },
     {
      "field_name" : "GetVersion",
      "field_offset" : 128,
-     "referenced_type" : "type-14"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvE"
     },
     {
      "field_name" : "DefineClass",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "_ZTIPFP7_jclassP7_JNIEnvPKcP8_jobjectPKaiE"
     },
     {
      "field_name" : "FindClass",
      "field_offset" : 192,
-     "referenced_type" : "type-27"
+     "referenced_type" : "_ZTIPFP7_jclassP7_JNIEnvPKcE"
     },
     {
      "field_name" : "FromReflectedMethod",
      "field_offset" : 224,
-     "referenced_type" : "type-29"
+     "referenced_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "FromReflectedField",
      "field_offset" : 256,
-     "referenced_type" : "type-33"
+     "referenced_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "ToReflectedMethod",
      "field_offset" : 288,
-     "referenced_type" : "type-37"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDhE"
     },
     {
      "field_name" : "GetSuperclass",
      "field_offset" : 320,
-     "referenced_type" : "type-40"
+     "referenced_type" : "_ZTIPFP7_jclassP7_JNIEnvS0_E"
     },
     {
      "field_name" : "IsAssignableFrom",
      "field_offset" : 352,
-     "referenced_type" : "type-42"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassS2_E"
     },
     {
      "field_name" : "ToReflectedField",
      "field_offset" : 384,
-     "referenced_type" : "type-44"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDhE"
     },
     {
      "field_name" : "Throw",
      "field_offset" : 416,
-     "referenced_type" : "type-46"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP11_jthrowableE"
     },
     {
      "field_name" : "ThrowNew",
      "field_offset" : 448,
-     "referenced_type" : "type-50"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassPKcE"
     },
     {
      "field_name" : "ExceptionOccurred",
      "field_offset" : 480,
-     "referenced_type" : "type-52"
+     "referenced_type" : "_ZTIPFP11_jthrowableP7_JNIEnvE"
     },
     {
      "field_name" : "ExceptionDescribe",
      "field_offset" : 512,
-     "referenced_type" : "type-54"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvE"
     },
     {
      "field_name" : "ExceptionClear",
      "field_offset" : 544,
-     "referenced_type" : "type-54"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvE"
     },
     {
      "field_name" : "FatalError",
      "field_offset" : 576,
-     "referenced_type" : "type-56"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvPKcE"
     },
     {
      "field_name" : "PushLocalFrame",
      "field_offset" : 608,
-     "referenced_type" : "type-58"
+     "referenced_type" : "_ZTIPFiP7_JNIEnviE"
     },
     {
      "field_name" : "PopLocalFrame",
      "field_offset" : 640,
-     "referenced_type" : "type-60"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E"
     },
     {
      "field_name" : "NewGlobalRef",
      "field_offset" : 672,
-     "referenced_type" : "type-60"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E"
     },
     {
      "field_name" : "DeleteGlobalRef",
      "field_offset" : 704,
-     "referenced_type" : "type-62"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "DeleteLocalRef",
      "field_offset" : 736,
-     "referenced_type" : "type-62"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "IsSameObject",
      "field_offset" : 768,
-     "referenced_type" : "type-64"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectS2_E"
     },
     {
      "field_name" : "NewLocalRef",
      "field_offset" : 800,
-     "referenced_type" : "type-60"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E"
     },
     {
      "field_name" : "EnsureLocalCapacity",
      "field_offset" : 832,
-     "referenced_type" : "type-58"
+     "referenced_type" : "_ZTIPFiP7_JNIEnviE"
     },
     {
      "field_name" : "AllocObject",
      "field_offset" : 864,
-     "referenced_type" : "type-3"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassE"
     },
     {
      "field_name" : "NewObject",
      "field_offset" : 896,
-     "referenced_type" : "type-66"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "NewObjectV",
      "field_offset" : 928,
-     "referenced_type" : "type-68"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "NewObjectA",
      "field_offset" : 960,
-     "referenced_type" : "type-71"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "GetObjectClass",
      "field_offset" : 992,
-     "referenced_type" : "type-81"
+     "referenced_type" : "_ZTIPFP7_jclassP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "IsInstanceOf",
      "field_offset" : 1024,
-     "referenced_type" : "type-83"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassE"
     },
     {
      "field_name" : "GetMethodID",
      "field_offset" : 1056,
-     "referenced_type" : "type-85"
+     "referenced_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E"
     },
     {
      "field_name" : "CallObjectMethod",
      "field_offset" : 1088,
-     "referenced_type" : "type-87"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDzE"
     },
     {
      "field_name" : "CallObjectMethodV",
      "field_offset" : 1120,
-     "referenced_type" : "type-89"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPcE"
     },
     {
      "field_name" : "CallObjectMethodA",
      "field_offset" : 1152,
-     "referenced_type" : "type-91"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallBooleanMethod",
      "field_offset" : 1184,
-     "referenced_type" : "type-93"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallBooleanMethodV",
      "field_offset" : 1216,
-     "referenced_type" : "type-95"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallBooleanMethodA",
      "field_offset" : 1248,
-     "referenced_type" : "type-97"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallByteMethod",
      "field_offset" : 1280,
-     "referenced_type" : "type-99"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallByteMethodV",
      "field_offset" : 1312,
-     "referenced_type" : "type-101"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallByteMethodA",
      "field_offset" : 1344,
-     "referenced_type" : "type-103"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallCharMethod",
      "field_offset" : 1376,
-     "referenced_type" : "type-105"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallCharMethodV",
      "field_offset" : 1408,
-     "referenced_type" : "type-107"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallCharMethodA",
      "field_offset" : 1440,
-     "referenced_type" : "type-109"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallShortMethod",
      "field_offset" : 1472,
-     "referenced_type" : "type-111"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallShortMethodV",
      "field_offset" : 1504,
-     "referenced_type" : "type-113"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallShortMethodA",
      "field_offset" : 1536,
-     "referenced_type" : "type-115"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallIntMethod",
      "field_offset" : 1568,
-     "referenced_type" : "type-117"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallIntMethodV",
      "field_offset" : 1600,
-     "referenced_type" : "type-119"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallIntMethodA",
      "field_offset" : 1632,
-     "referenced_type" : "type-121"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallLongMethod",
      "field_offset" : 1664,
-     "referenced_type" : "type-123"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallLongMethodV",
      "field_offset" : 1696,
-     "referenced_type" : "type-125"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallLongMethodA",
      "field_offset" : 1728,
-     "referenced_type" : "type-127"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallFloatMethod",
      "field_offset" : 1760,
-     "referenced_type" : "type-129"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallFloatMethodV",
      "field_offset" : 1792,
-     "referenced_type" : "type-131"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallFloatMethodA",
      "field_offset" : 1824,
-     "referenced_type" : "type-133"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallDoubleMethod",
      "field_offset" : 1856,
-     "referenced_type" : "type-135"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallDoubleMethodV",
      "field_offset" : 1888,
-     "referenced_type" : "type-137"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallDoubleMethodA",
      "field_offset" : 1920,
-     "referenced_type" : "type-139"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallVoidMethod",
      "field_offset" : 1952,
-     "referenced_type" : "type-141"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDzE"
     },
     {
      "field_name" : "CallVoidMethodV",
      "field_offset" : 1984,
-     "referenced_type" : "type-143"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallVoidMethodA",
      "field_offset" : 2016,
-     "referenced_type" : "type-145"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualObjectMethod",
      "field_offset" : 2048,
-     "referenced_type" : "type-147"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualObjectMethodV",
      "field_offset" : 2080,
-     "referenced_type" : "type-149"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallNonvirtualObjectMethodA",
      "field_offset" : 2112,
-     "referenced_type" : "type-151"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualBooleanMethod",
      "field_offset" : 2144,
-     "referenced_type" : "type-153"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualBooleanMethodV",
      "field_offset" : 2176,
-     "referenced_type" : "type-155"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallNonvirtualBooleanMethodA",
      "field_offset" : 2208,
-     "referenced_type" : "type-157"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualByteMethod",
      "field_offset" : 2240,
-     "referenced_type" : "type-159"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualByteMethodV",
      "field_offset" : 2272,
-     "referenced_type" : "type-161"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallNonvirtualByteMethodA",
      "field_offset" : 2304,
-     "referenced_type" : "type-163"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualCharMethod",
      "field_offset" : 2336,
-     "referenced_type" : "type-165"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualCharMethodV",
      "field_offset" : 2368,
-     "referenced_type" : "type-167"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallNonvirtualCharMethodA",
      "field_offset" : 2400,
-     "referenced_type" : "type-169"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualShortMethod",
      "field_offset" : 2432,
-     "referenced_type" : "type-171"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualShortMethodV",
      "field_offset" : 2464,
-     "referenced_type" : "type-173"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallNonvirtualShortMethodA",
      "field_offset" : 2496,
-     "referenced_type" : "type-175"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualIntMethod",
      "field_offset" : 2528,
-     "referenced_type" : "type-177"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualIntMethodV",
      "field_offset" : 2560,
-     "referenced_type" : "type-179"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallNonvirtualIntMethodA",
      "field_offset" : 2592,
-     "referenced_type" : "type-181"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualLongMethod",
      "field_offset" : 2624,
-     "referenced_type" : "type-183"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualLongMethodV",
      "field_offset" : 2656,
-     "referenced_type" : "type-185"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallNonvirtualLongMethodA",
      "field_offset" : 2688,
-     "referenced_type" : "type-187"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualFloatMethod",
      "field_offset" : 2720,
-     "referenced_type" : "type-189"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualFloatMethodV",
      "field_offset" : 2752,
-     "referenced_type" : "type-191"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallNonvirtualFloatMethodA",
      "field_offset" : 2784,
-     "referenced_type" : "type-193"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualDoubleMethod",
      "field_offset" : 2816,
-     "referenced_type" : "type-195"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualDoubleMethodV",
      "field_offset" : 2848,
-     "referenced_type" : "type-197"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallNonvirtualDoubleMethodA",
      "field_offset" : 2880,
-     "referenced_type" : "type-199"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallNonvirtualVoidMethod",
      "field_offset" : 2912,
-     "referenced_type" : "type-201"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallNonvirtualVoidMethodV",
      "field_offset" : 2944,
-     "referenced_type" : "type-203"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallNonvirtualVoidMethodA",
      "field_offset" : 2976,
-     "referenced_type" : "type-205"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "GetFieldID",
      "field_offset" : 3008,
-     "referenced_type" : "type-207"
+     "referenced_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E"
     },
     {
      "field_name" : "GetObjectField",
      "field_offset" : 3040,
-     "referenced_type" : "type-209"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_P9_jfieldIDE"
     },
     {
      "field_name" : "GetBooleanField",
      "field_offset" : 3072,
-     "referenced_type" : "type-211"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetByteField",
      "field_offset" : 3104,
-     "referenced_type" : "type-213"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetCharField",
      "field_offset" : 3136,
-     "referenced_type" : "type-215"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetShortField",
      "field_offset" : 3168,
-     "referenced_type" : "type-217"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetIntField",
      "field_offset" : 3200,
-     "referenced_type" : "type-219"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetLongField",
      "field_offset" : 3232,
-     "referenced_type" : "type-221"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetFloatField",
      "field_offset" : 3264,
-     "referenced_type" : "type-223"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "GetDoubleField",
      "field_offset" : 3296,
-     "referenced_type" : "type-225"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP8_jobjectP9_jfieldIDE"
     },
     {
      "field_name" : "SetObjectField",
      "field_offset" : 3328,
-     "referenced_type" : "type-227"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDS2_E"
     },
     {
      "field_name" : "SetBooleanField",
      "field_offset" : 3360,
-     "referenced_type" : "type-229"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDhE"
     },
     {
      "field_name" : "SetByteField",
      "field_offset" : 3392,
-     "referenced_type" : "type-231"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDaE"
     },
     {
      "field_name" : "SetCharField",
      "field_offset" : 3424,
-     "referenced_type" : "type-233"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDtE"
     },
     {
      "field_name" : "SetShortField",
      "field_offset" : 3456,
-     "referenced_type" : "type-235"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDsE"
     },
     {
      "field_name" : "SetIntField",
      "field_offset" : 3488,
-     "referenced_type" : "type-237"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDiE"
     },
     {
      "field_name" : "SetLongField",
      "field_offset" : 3520,
-     "referenced_type" : "type-239"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDxE"
     },
     {
      "field_name" : "SetFloatField",
      "field_offset" : 3552,
-     "referenced_type" : "type-241"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDfE"
     },
     {
      "field_name" : "SetDoubleField",
      "field_offset" : 3584,
-     "referenced_type" : "type-243"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectP9_jfieldIDdE"
     },
     {
      "field_name" : "GetStaticMethodID",
      "field_offset" : 3616,
-     "referenced_type" : "type-85"
+     "referenced_type" : "_ZTIPFP10_jmethodIDP7_JNIEnvP7_jclassPKcS6_E"
     },
     {
      "field_name" : "CallStaticObjectMethod",
      "field_offset" : 3648,
-     "referenced_type" : "type-66"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticObjectMethodV",
      "field_offset" : 3680,
-     "referenced_type" : "type-68"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallStaticObjectMethodA",
      "field_offset" : 3712,
-     "referenced_type" : "type-71"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticBooleanMethod",
      "field_offset" : 3744,
-     "referenced_type" : "type-245"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticBooleanMethodV",
      "field_offset" : 3776,
-     "referenced_type" : "type-247"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallStaticBooleanMethodA",
      "field_offset" : 3808,
-     "referenced_type" : "type-249"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticByteMethod",
      "field_offset" : 3840,
-     "referenced_type" : "type-251"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticByteMethodV",
      "field_offset" : 3872,
-     "referenced_type" : "type-253"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallStaticByteMethodA",
      "field_offset" : 3904,
-     "referenced_type" : "type-255"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticCharMethod",
      "field_offset" : 3936,
-     "referenced_type" : "type-257"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticCharMethodV",
      "field_offset" : 3968,
-     "referenced_type" : "type-259"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallStaticCharMethodA",
      "field_offset" : 4000,
-     "referenced_type" : "type-261"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticShortMethod",
      "field_offset" : 4032,
-     "referenced_type" : "type-263"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticShortMethodV",
      "field_offset" : 4064,
-     "referenced_type" : "type-265"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallStaticShortMethodA",
      "field_offset" : 4096,
-     "referenced_type" : "type-267"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticIntMethod",
      "field_offset" : 4128,
-     "referenced_type" : "type-269"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticIntMethodV",
      "field_offset" : 4160,
-     "referenced_type" : "type-271"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallStaticIntMethodA",
      "field_offset" : 4192,
-     "referenced_type" : "type-273"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticLongMethod",
      "field_offset" : 4224,
-     "referenced_type" : "type-275"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticLongMethodV",
      "field_offset" : 4256,
-     "referenced_type" : "type-277"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallStaticLongMethodA",
      "field_offset" : 4288,
-     "referenced_type" : "type-279"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticFloatMethod",
      "field_offset" : 4320,
-     "referenced_type" : "type-281"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticFloatMethodV",
      "field_offset" : 4352,
-     "referenced_type" : "type-283"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallStaticFloatMethodA",
      "field_offset" : 4384,
-     "referenced_type" : "type-285"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticDoubleMethod",
      "field_offset" : 4416,
-     "referenced_type" : "type-287"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticDoubleMethodV",
      "field_offset" : 4448,
-     "referenced_type" : "type-289"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallStaticDoubleMethodA",
      "field_offset" : 4480,
-     "referenced_type" : "type-291"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "CallStaticVoidMethod",
      "field_offset" : 4512,
-     "referenced_type" : "type-293"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDzE"
     },
     {
      "field_name" : "CallStaticVoidMethodV",
      "field_offset" : 4544,
-     "referenced_type" : "type-295"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDPcE"
     },
     {
      "field_name" : "CallStaticVoidMethodA",
      "field_offset" : 4576,
-     "referenced_type" : "type-297"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP10_jmethodIDPK6jvalueE"
     },
     {
      "field_name" : "GetStaticFieldID",
      "field_offset" : 4608,
-     "referenced_type" : "type-207"
+     "referenced_type" : "_ZTIPFP9_jfieldIDP7_JNIEnvP7_jclassPKcS6_E"
     },
     {
      "field_name" : "GetStaticObjectField",
      "field_offset" : 4640,
-     "referenced_type" : "type-299"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticBooleanField",
      "field_offset" : 4672,
-     "referenced_type" : "type-301"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticByteField",
      "field_offset" : 4704,
-     "referenced_type" : "type-303"
+     "referenced_type" : "_ZTIPFaP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticCharField",
      "field_offset" : 4736,
-     "referenced_type" : "type-305"
+     "referenced_type" : "_ZTIPFtP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticShortField",
      "field_offset" : 4768,
-     "referenced_type" : "type-307"
+     "referenced_type" : "_ZTIPFsP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticIntField",
      "field_offset" : 4800,
-     "referenced_type" : "type-309"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticLongField",
      "field_offset" : 4832,
-     "referenced_type" : "type-311"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticFloatField",
      "field_offset" : 4864,
-     "referenced_type" : "type-313"
+     "referenced_type" : "_ZTIPFfP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "GetStaticDoubleField",
      "field_offset" : 4896,
-     "referenced_type" : "type-315"
+     "referenced_type" : "_ZTIPFdP7_JNIEnvP7_jclassP9_jfieldIDE"
     },
     {
      "field_name" : "SetStaticObjectField",
      "field_offset" : 4928,
-     "referenced_type" : "type-317"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDP8_jobjectE"
     },
     {
      "field_name" : "SetStaticBooleanField",
      "field_offset" : 4960,
-     "referenced_type" : "type-319"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDhE"
     },
     {
      "field_name" : "SetStaticByteField",
      "field_offset" : 4992,
-     "referenced_type" : "type-321"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDaE"
     },
     {
      "field_name" : "SetStaticCharField",
      "field_offset" : 5024,
-     "referenced_type" : "type-323"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDtE"
     },
     {
      "field_name" : "SetStaticShortField",
      "field_offset" : 5056,
-     "referenced_type" : "type-325"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDsE"
     },
     {
      "field_name" : "SetStaticIntField",
      "field_offset" : 5088,
-     "referenced_type" : "type-327"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDiE"
     },
     {
      "field_name" : "SetStaticLongField",
      "field_offset" : 5120,
-     "referenced_type" : "type-329"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDxE"
     },
     {
      "field_name" : "SetStaticFloatField",
      "field_offset" : 5152,
-     "referenced_type" : "type-331"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDfE"
     },
     {
      "field_name" : "SetStaticDoubleField",
      "field_offset" : 5184,
-     "referenced_type" : "type-333"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jclassP9_jfieldIDdE"
     },
     {
      "field_name" : "NewString",
      "field_offset" : 5216,
-     "referenced_type" : "type-335"
+     "referenced_type" : "_ZTIPFP8_jstringP7_JNIEnvPKtiE"
     },
     {
      "field_name" : "GetStringLength",
      "field_offset" : 5248,
-     "referenced_type" : "type-341"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jstringE"
     },
     {
      "field_name" : "GetStringChars",
      "field_offset" : 5280,
-     "referenced_type" : "type-343"
+     "referenced_type" : "_ZTIPFPKtP7_JNIEnvP8_jstringPhE"
     },
     {
      "field_name" : "ReleaseStringChars",
      "field_offset" : 5312,
-     "referenced_type" : "type-346"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKtE"
     },
     {
      "field_name" : "NewStringUTF",
      "field_offset" : 5344,
-     "referenced_type" : "type-348"
+     "referenced_type" : "_ZTIPFP8_jstringP7_JNIEnvPKcE"
     },
     {
      "field_name" : "GetStringUTFLength",
      "field_offset" : 5376,
-     "referenced_type" : "type-341"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jstringE"
     },
     {
      "field_name" : "GetStringUTFChars",
      "field_offset" : 5408,
-     "referenced_type" : "type-350"
+     "referenced_type" : "_ZTIPFPKcP7_JNIEnvP8_jstringPhE"
     },
     {
      "field_name" : "ReleaseStringUTFChars",
      "field_offset" : 5440,
-     "referenced_type" : "type-352"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKcE"
     },
     {
      "field_name" : "GetArrayLength",
      "field_offset" : 5472,
-     "referenced_type" : "type-354"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jarrayE"
     },
     {
      "field_name" : "NewObjectArray",
      "field_offset" : 5504,
-     "referenced_type" : "type-358"
+     "referenced_type" : "_ZTIPFP13_jobjectArrayP7_JNIEnviP7_jclassP8_jobjectE"
     },
     {
      "field_name" : "GetObjectArrayElement",
      "field_offset" : 5536,
-     "referenced_type" : "type-362"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvP13_jobjectArrayiE"
     },
     {
      "field_name" : "SetObjectArrayElement",
      "field_offset" : 5568,
-     "referenced_type" : "type-364"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP13_jobjectArrayiP8_jobjectE"
     },
     {
      "field_name" : "NewBooleanArray",
      "field_offset" : 5600,
-     "referenced_type" : "type-366"
+     "referenced_type" : "_ZTIPFP14_jbooleanArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewByteArray",
      "field_offset" : 5632,
-     "referenced_type" : "type-370"
+     "referenced_type" : "_ZTIPFP11_jbyteArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewCharArray",
      "field_offset" : 5664,
-     "referenced_type" : "type-374"
+     "referenced_type" : "_ZTIPFP11_jcharArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewShortArray",
      "field_offset" : 5696,
-     "referenced_type" : "type-378"
+     "referenced_type" : "_ZTIPFP12_jshortArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewIntArray",
      "field_offset" : 5728,
-     "referenced_type" : "type-382"
+     "referenced_type" : "_ZTIPFP10_jintArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewLongArray",
      "field_offset" : 5760,
-     "referenced_type" : "type-386"
+     "referenced_type" : "_ZTIPFP11_jlongArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewFloatArray",
      "field_offset" : 5792,
-     "referenced_type" : "type-390"
+     "referenced_type" : "_ZTIPFP12_jfloatArrayP7_JNIEnviE"
     },
     {
      "field_name" : "NewDoubleArray",
      "field_offset" : 5824,
-     "referenced_type" : "type-394"
+     "referenced_type" : "_ZTIPFP13_jdoubleArrayP7_JNIEnviE"
     },
     {
      "field_name" : "GetBooleanArrayElements",
      "field_offset" : 5856,
-     "referenced_type" : "type-398"
+     "referenced_type" : "_ZTIPFPhP7_JNIEnvP14_jbooleanArrayS_E"
     },
     {
      "field_name" : "GetByteArrayElements",
      "field_offset" : 5888,
-     "referenced_type" : "type-400"
+     "referenced_type" : "_ZTIPFPaP7_JNIEnvP11_jbyteArrayPhE"
     },
     {
      "field_name" : "GetCharArrayElements",
      "field_offset" : 5920,
-     "referenced_type" : "type-403"
+     "referenced_type" : "_ZTIPFPtP7_JNIEnvP11_jcharArrayPhE"
     },
     {
      "field_name" : "GetShortArrayElements",
      "field_offset" : 5952,
-     "referenced_type" : "type-406"
+     "referenced_type" : "_ZTIPFPsP7_JNIEnvP12_jshortArrayPhE"
     },
     {
      "field_name" : "GetIntArrayElements",
      "field_offset" : 5984,
-     "referenced_type" : "type-409"
+     "referenced_type" : "_ZTIPFPiP7_JNIEnvP10_jintArrayPhE"
     },
     {
      "field_name" : "GetLongArrayElements",
      "field_offset" : 6016,
-     "referenced_type" : "type-412"
+     "referenced_type" : "_ZTIPFPxP7_JNIEnvP11_jlongArrayPhE"
     },
     {
      "field_name" : "GetFloatArrayElements",
      "field_offset" : 6048,
-     "referenced_type" : "type-415"
+     "referenced_type" : "_ZTIPFPfP7_JNIEnvP12_jfloatArrayPhE"
     },
     {
      "field_name" : "GetDoubleArrayElements",
      "field_offset" : 6080,
-     "referenced_type" : "type-418"
+     "referenced_type" : "_ZTIPFPdP7_JNIEnvP13_jdoubleArrayPhE"
     },
     {
      "field_name" : "ReleaseBooleanArrayElements",
      "field_offset" : 6112,
-     "referenced_type" : "type-421"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayPhiE"
     },
     {
      "field_name" : "ReleaseByteArrayElements",
      "field_offset" : 6144,
-     "referenced_type" : "type-423"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayPaiE"
     },
     {
      "field_name" : "ReleaseCharArrayElements",
      "field_offset" : 6176,
-     "referenced_type" : "type-425"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayPtiE"
     },
     {
      "field_name" : "ReleaseShortArrayElements",
      "field_offset" : 6208,
-     "referenced_type" : "type-427"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayPsiE"
     },
     {
      "field_name" : "ReleaseIntArrayElements",
      "field_offset" : 6240,
-     "referenced_type" : "type-429"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayPiiE"
     },
     {
      "field_name" : "ReleaseLongArrayElements",
      "field_offset" : 6272,
-     "referenced_type" : "type-431"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayPxiE"
     },
     {
      "field_name" : "ReleaseFloatArrayElements",
      "field_offset" : 6304,
-     "referenced_type" : "type-433"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayPfiE"
     },
     {
      "field_name" : "ReleaseDoubleArrayElements",
      "field_offset" : 6336,
-     "referenced_type" : "type-435"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayPdiE"
     },
     {
      "field_name" : "GetBooleanArrayRegion",
      "field_offset" : 6368,
-     "referenced_type" : "type-437"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPhE"
     },
     {
      "field_name" : "GetByteArrayRegion",
      "field_offset" : 6400,
-     "referenced_type" : "type-439"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPaE"
     },
     {
      "field_name" : "GetCharArrayRegion",
      "field_offset" : 6432,
-     "referenced_type" : "type-441"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPtE"
     },
     {
      "field_name" : "GetShortArrayRegion",
      "field_offset" : 6464,
-     "referenced_type" : "type-443"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPsE"
     },
     {
      "field_name" : "GetIntArrayRegion",
      "field_offset" : 6496,
-     "referenced_type" : "type-445"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPiE"
     },
     {
      "field_name" : "GetLongArrayRegion",
      "field_offset" : 6528,
-     "referenced_type" : "type-447"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPxE"
     },
     {
      "field_name" : "GetFloatArrayRegion",
      "field_offset" : 6560,
-     "referenced_type" : "type-449"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPfE"
     },
     {
      "field_name" : "GetDoubleArrayRegion",
      "field_offset" : 6592,
-     "referenced_type" : "type-451"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPdE"
     },
     {
      "field_name" : "SetBooleanArrayRegion",
      "field_offset" : 6624,
-     "referenced_type" : "type-453"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP14_jbooleanArrayiiPKhE"
     },
     {
      "field_name" : "SetByteArrayRegion",
      "field_offset" : 6656,
-     "referenced_type" : "type-457"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jbyteArrayiiPKaE"
     },
     {
      "field_name" : "SetCharArrayRegion",
      "field_offset" : 6688,
-     "referenced_type" : "type-459"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jcharArrayiiPKtE"
     },
     {
      "field_name" : "SetShortArrayRegion",
      "field_offset" : 6720,
-     "referenced_type" : "type-461"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jshortArrayiiPKsE"
     },
     {
      "field_name" : "SetIntArrayRegion",
      "field_offset" : 6752,
-     "referenced_type" : "type-465"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP10_jintArrayiiPKiE"
     },
     {
      "field_name" : "SetLongArrayRegion",
      "field_offset" : 6784,
-     "referenced_type" : "type-469"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP11_jlongArrayiiPKxE"
     },
     {
      "field_name" : "SetFloatArrayRegion",
      "field_offset" : 6816,
-     "referenced_type" : "type-473"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP12_jfloatArrayiiPKfE"
     },
     {
      "field_name" : "SetDoubleArrayRegion",
      "field_offset" : 6848,
-     "referenced_type" : "type-477"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP13_jdoubleArrayiiPKdE"
     },
     {
      "field_name" : "RegisterNatives",
      "field_offset" : 6880,
-     "referenced_type" : "type-481"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassPK15JNINativeMethodiE"
     },
     {
      "field_name" : "UnregisterNatives",
      "field_offset" : 6912,
-     "referenced_type" : "type-486"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP7_jclassE"
     },
     {
      "field_name" : "MonitorEnter",
      "field_offset" : 6944,
-     "referenced_type" : "type-488"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "MonitorExit",
      "field_offset" : 6976,
-     "referenced_type" : "type-488"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "GetJavaVM",
      "field_offset" : 7008,
-     "referenced_type" : "type-490"
+     "referenced_type" : "_ZTIPFiP7_JNIEnvPP7_JavaVME"
     },
     {
      "field_name" : "GetStringRegion",
      "field_offset" : 7040,
-     "referenced_type" : "type-506"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringiiPtE"
     },
     {
      "field_name" : "GetStringUTFRegion",
      "field_offset" : 7072,
-     "referenced_type" : "type-508"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringiiPcE"
     },
     {
      "field_name" : "GetPrimitiveArrayCritical",
      "field_offset" : 7104,
-     "referenced_type" : "type-510"
+     "referenced_type" : "_ZTIPFPvP7_JNIEnvP7_jarrayPhE"
     },
     {
      "field_name" : "ReleasePrimitiveArrayCritical",
      "field_offset" : 7136,
-     "referenced_type" : "type-512"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP7_jarrayPviE"
     },
     {
      "field_name" : "GetStringCritical",
      "field_offset" : 7168,
-     "referenced_type" : "type-343"
+     "referenced_type" : "_ZTIPFPKtP7_JNIEnvP8_jstringPhE"
     },
     {
      "field_name" : "ReleaseStringCritical",
      "field_offset" : 7200,
-     "referenced_type" : "type-346"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jstringPKtE"
     },
     {
      "field_name" : "NewWeakGlobalRef",
      "field_offset" : 7232,
-     "referenced_type" : "type-60"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvS0_E"
     },
     {
      "field_name" : "DeleteWeakGlobalRef",
      "field_offset" : 7264,
-     "referenced_type" : "type-62"
+     "referenced_type" : "_ZTIPFvP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "ExceptionCheck",
      "field_offset" : 7296,
-     "referenced_type" : "type-514"
+     "referenced_type" : "_ZTIPFhP7_JNIEnvE"
     },
     {
      "field_name" : "NewDirectByteBuffer",
      "field_offset" : 7328,
-     "referenced_type" : "type-516"
+     "referenced_type" : "_ZTIPFP8_jobjectP7_JNIEnvPvxE"
     },
     {
      "field_name" : "GetDirectBufferAddress",
      "field_offset" : 7360,
-     "referenced_type" : "type-518"
+     "referenced_type" : "_ZTIPFPvP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "GetDirectBufferCapacity",
      "field_offset" : 7392,
-     "referenced_type" : "type-520"
+     "referenced_type" : "_ZTIPFxP7_JNIEnvP8_jobjectE"
     },
     {
      "field_name" : "GetObjectRefType",
      "field_offset" : 7424,
-     "referenced_type" : "type-522"
+     "referenced_type" : "_ZTIPF14jobjectRefTypeP7_JNIEnvP8_jobjectE"
     }
    ],
    "linker_set_key" : "_ZTI18JNINativeInterface",
    "name" : "JNINativeInterface",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "_ZTI18JNINativeInterface",
+   "self_type" : "_ZTI18JNINativeInterface",
    "size" : 932,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12192,46 +11905,46 @@
    [
     {
      "field_name" : "z",
-     "referenced_type" : "type-39"
+     "referenced_type" : "_ZTIh"
     },
     {
      "field_name" : "b",
-     "referenced_type" : "type-26"
+     "referenced_type" : "_ZTIa"
     },
     {
      "field_name" : "c",
-     "referenced_type" : "type-76"
+     "referenced_type" : "_ZTIt"
     },
     {
      "field_name" : "s",
-     "referenced_type" : "type-77"
+     "referenced_type" : "_ZTIs"
     },
     {
      "field_name" : "i",
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "j",
-     "referenced_type" : "type-78"
+     "referenced_type" : "_ZTIx"
     },
     {
      "field_name" : "f",
-     "referenced_type" : "type-79"
+     "referenced_type" : "_ZTIf"
     },
     {
      "field_name" : "d",
-     "referenced_type" : "type-80"
+     "referenced_type" : "_ZTId"
     },
     {
      "field_name" : "l",
-     "referenced_type" : "type-5"
+     "referenced_type" : "_ZTIP8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI6jvalue",
    "name" : "jvalue",
    "record_kind" : "union",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "_ZTI6jvalue",
+   "self_type" : "_ZTI6jvalue",
    "size" : 8,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12241,13 +11954,13 @@
    [
     {
      "field_name" : "functions",
-     "referenced_type" : "type-9"
+     "referenced_type" : "_ZTIPK18JNINativeInterface"
     }
    ],
    "linker_set_key" : "_ZTI7_JNIEnv",
    "name" : "_JNIEnv",
-   "referenced_type" : "type-8",
-   "self_type" : "type-8",
+   "referenced_type" : "_ZTI7_JNIEnv",
+   "self_type" : "_ZTI7_JNIEnv",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12257,13 +11970,13 @@
    [
     {
      "field_name" : "functions",
-     "referenced_type" : "type-495"
+     "referenced_type" : "_ZTIPK18JNIInvokeInterface"
     }
    ],
    "linker_set_key" : "_ZTI7_JavaVM",
    "name" : "_JavaVM",
-   "referenced_type" : "type-494",
-   "self_type" : "type-494",
+   "referenced_type" : "_ZTI7_JavaVM",
+   "self_type" : "_ZTI7_JavaVM",
    "size" : 4,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12272,14 +11985,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTI8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI7_jarray",
    "name" : "_jarray",
    "record_kind" : "class",
-   "referenced_type" : "type-357",
-   "self_type" : "type-357",
+   "referenced_type" : "_ZTI7_jarray",
+   "self_type" : "_ZTI7_jarray",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12288,14 +12001,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTI8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI7_jclass",
    "name" : "_jclass",
    "record_kind" : "class",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "_ZTI7_jclass",
+   "self_type" : "_ZTI7_jclass",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12304,8 +12017,8 @@
    "linker_set_key" : "_ZTI8_jobject",
    "name" : "_jobject",
    "record_kind" : "class",
-   "referenced_type" : "type-6",
-   "self_type" : "type-6",
+   "referenced_type" : "_ZTI8_jobject",
+   "self_type" : "_ZTI8_jobject",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   },
@@ -12314,14 +12027,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-6"
+     "referenced_type" : "_ZTI8_jobject"
     }
    ],
    "linker_set_key" : "_ZTI8_jstring",
    "name" : "_jstring",
    "record_kind" : "class",
-   "referenced_type" : "type-338",
-   "self_type" : "type-338",
+   "referenced_type" : "_ZTI8_jstring",
+   "self_type" : "_ZTI8_jstring",
    "size" : 1,
    "source_file" : "/libnativehelper/include_jni/jni.h"
   }