Update ABI for libprocessgroup and libcutils

Bug: 130270919
Test: build and boot

Change-Id: I37695a9f4872cf96e319f7d56146ab46b666404f
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
diff --git a/Q/32/arm_armv7-a-neon/source-based/libcutils.so.lsdump b/Q/32/arm_armv7-a-neon/source-based/libcutils.so.lsdump
index 09f26e5..3a766b9 100644
--- a/Q/32/arm_armv7-a-neon/source-based/libcutils.so.lsdump
+++ b/Q/32/arm_armv7-a-neon/source-based/libcutils.so.lsdump
@@ -5,8 +5,8 @@
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-18",
-   "self_type" : "type-21",
+   "referenced_type" : "type-10",
+   "self_type" : "type-15",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   }
  ],
@@ -18,8 +18,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-15",
-   "self_type" : "type-15",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
    "size" : 1
   },
   {
@@ -38,24 +38,24 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 2
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-90",
-   "self_type" : "type-90",
+   "referenced_type" : "type-127",
+   "self_type" : "type-127",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
    "size" : 4
   },
   {
@@ -63,8 +63,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-18",
-   "self_type" : "type-18",
+   "referenced_type" : "type-10",
+   "self_type" : "type-10",
    "size" : 4
   },
   {
@@ -72,16 +72,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
+   "referenced_type" : "type-132",
+   "self_type" : "type-132",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
+   "referenced_type" : "type-131",
+   "self_type" : "type-131",
    "size" : 8
   },
   {
@@ -89,8 +89,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-8",
-   "self_type" : "type-8",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
    "size" : 8
   },
   {
@@ -98,8 +98,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
+   "referenced_type" : "type-130",
+   "self_type" : "type-130",
    "size" : 2
   },
   {
@@ -107,8 +107,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 1
   },
   {
@@ -117,8 +117,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-91",
-   "self_type" : "type-91",
+   "referenced_type" : "type-128",
+   "self_type" : "type-128",
    "size" : 1
   },
   {
@@ -137,8 +137,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-92",
-   "self_type" : "type-92",
+   "referenced_type" : "type-129",
+   "self_type" : "type-129",
    "size" : 4
   },
   {
@@ -147,8 +147,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
+   "referenced_type" : "type-85",
+   "self_type" : "type-85",
    "size" : 8
   },
   {
@@ -157,8 +157,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
+   "referenced_type" : "type-34",
+   "self_type" : "type-34",
    "size" : 2
   },
   {
@@ -592,8 +592,8 @@
    ],
    "linker_set_key" : "IoSchedClass",
    "name" : "IoSchedClass",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
+   "referenced_type" : "type-8",
+   "self_type" : "type-8",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/iosched_policy.h",
    "underlying_type" : "type-6",
@@ -609,15 +609,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "referenced_type" : "type-44",
-   "return_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "type-38",
+   "return_type" : "type-39",
+   "self_type" : "type-38",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -627,18 +627,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "referenced_type" : "type-46",
-   "return_type" : "type-47",
-   "self_type" : "type-46",
+   "referenced_type" : "type-40",
+   "return_type" : "type-41",
+   "self_type" : "type-40",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -648,12 +648,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "referenced_type" : "type-49",
-   "return_type" : "type-18",
-   "self_type" : "type-49",
+   "referenced_type" : "type-43",
+   "return_type" : "type-10",
+   "self_type" : "type-43",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -669,12 +669,12 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "referenced_type" : "type-11",
+   "referenced_type" : "type-80",
    "return_type" : "type-12",
-   "self_type" : "type-11",
+   "self_type" : "type-80",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -684,12 +684,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "referenced_type" : "type-38",
+   "referenced_type" : "type-32",
    "return_type" : "type-12",
-   "self_type" : "type-38",
+   "self_type" : "type-32",
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   }
  ],
@@ -704,7 +704,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/android_get_control_file.h"
   },
   {
@@ -716,7 +716,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -725,16 +725,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
+    },
+    {
+     "referenced_type" : "type-7"
     },
     {
      "referenced_type" : "type-9"
-    },
-    {
-     "referenced_type" : "type-17"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/iosched_policy.h"
   },
   {
@@ -746,13 +746,13 @@
      "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/android_reboot.h"
   },
   {
@@ -761,16 +761,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
-    },
-    {
      "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/iosched_policy.h"
   },
   {
@@ -785,7 +785,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -794,10 +794,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -812,7 +812,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
      "referenced_type" : "type-6"
@@ -821,7 +821,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -830,13 +830,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -845,7 +845,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
      "referenced_type" : "type-6"
@@ -854,7 +854,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -863,10 +863,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -878,7 +878,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
    "return_type" : "type-12",
@@ -893,7 +893,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
    "return_type" : "type-12",
@@ -926,7 +926,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-8"
+     "referenced_type" : "type-78"
     }
    ],
    "return_type" : "type-12",
@@ -941,7 +941,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
    "return_type" : "type-12",
@@ -953,7 +953,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-84"
     }
    ],
    "return_type" : "type-12",
@@ -965,7 +965,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-84"
     }
    ],
    "return_type" : "type-12",
@@ -995,10 +995,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/config_utils.h"
   },
   {
@@ -1037,7 +1037,7 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-45"
     }
    ],
    "return_type" : "type-12",
@@ -1118,10 +1118,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-34"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1133,7 +1133,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-34"
     },
     {
      "referenced_type" : "type-6"
@@ -1142,7 +1142,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1154,7 +1154,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-34"
     },
     {
      "referenced_type" : "type-6"
@@ -1163,7 +1163,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1175,7 +1175,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-34"
     },
     {
      "referenced_type" : "type-6"
@@ -1184,7 +1184,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1196,10 +1196,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1211,10 +1211,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1226,13 +1226,13 @@
      "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-35",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1241,13 +1241,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-35"
     },
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-42"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
    "return_type" : "type-12",
@@ -1259,7 +1259,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-35"
     }
    ],
    "return_type" : "type-12",
@@ -1271,13 +1271,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-35"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "type-11",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1286,13 +1286,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     },
     {
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1301,7 +1301,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-35"
     }
    ],
    "return_type" : "type-12",
@@ -1313,16 +1313,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-35"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "type-11",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1331,13 +1331,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-35"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "type-11",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1346,7 +1346,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-35"
     }
    ],
    "return_type" : "type-12",
@@ -1358,7 +1358,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
    "return_type" : "type-12",
@@ -1370,7 +1370,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
      "referenced_type" : "type-3"
@@ -1385,13 +1385,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-115"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
    "return_type" : "type-12",
@@ -1406,10 +1406,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "type-11",
    "source_file" : "/system/core/libcutils/include/cutils/misc.h"
   },
   {
@@ -1529,10 +1529,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-17"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-18",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1541,10 +1541,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-17"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1553,13 +1553,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-18",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1568,10 +1568,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-18"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1580,16 +1580,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-18",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1601,7 +1601,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/partition_utils.h"
   },
   {
@@ -1613,13 +1613,13 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-45"
     },
     {
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1631,10 +1631,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-77"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-77",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1646,10 +1646,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1661,10 +1661,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-8"
+     "referenced_type" : "type-78"
     }
    ],
-   "return_type" : "type-8",
+   "return_type" : "type-78",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1673,13 +1673,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-83"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1694,7 +1694,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1703,7 +1703,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-19"
     }
    ],
    "return_type" : "type-12",
@@ -1715,16 +1715,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-27"
-    },
-    {
      "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-21"
+    },
+    {
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
   {
@@ -1733,13 +1733,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-25",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
   {
@@ -1748,10 +1748,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1760,10 +1760,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1772,13 +1772,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1790,13 +1790,13 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1805,19 +1805,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1829,13 +1829,13 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1844,16 +1844,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1865,13 +1865,13 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1883,19 +1883,19 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1904,16 +1904,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-72"
     },
     {
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1922,13 +1922,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1937,16 +1937,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-73"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-57"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1955,16 +1955,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-73"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1973,7 +1973,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-73"
     },
     {
      "referenced_type" : "type-3"
@@ -1982,13 +1982,13 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
    "function_name" : "str_parms_create",
    "linker_set_key" : "str_parms_create",
-   "return_type" : "type-54",
+   "return_type" : "type-73",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2000,7 +2000,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-54",
+   "return_type" : "type-73",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2009,7 +2009,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-73"
     },
     {
      "referenced_type" : "type-3"
@@ -2024,7 +2024,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-73"
     }
    ],
    "return_type" : "type-12",
@@ -2036,7 +2036,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-73"
     }
    ],
    "return_type" : "type-12",
@@ -2048,16 +2048,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-73"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-75"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2066,16 +2066,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-73"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2084,19 +2084,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-73"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2105,13 +2105,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-73"
     },
     {
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2120,10 +2120,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-51",
+   "return_type" : "type-45",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2132,16 +2132,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-28"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-34",
+   "return_type" : "type-28",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2150,19 +2150,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-28"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-34",
+   "return_type" : "type-28",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2174,10 +2174,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-34",
+   "return_type" : "type-28",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2198,16 +2198,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-27"
     },
     {
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-51",
+   "return_type" : "type-45",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2216,13 +2216,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-27"
     },
     {
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-51",
+   "return_type" : "type-45",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2231,7 +2231,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-27"
     },
     {
      "referenced_type" : "type-6"
@@ -2246,10 +2246,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-37"
+     "referenced_type" : "type-31"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "type-11",
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   },
   {
@@ -2258,13 +2258,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-37"
+     "referenced_type" : "type-31"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-33"
     }
    ],
    "return_type" : "type-12",
@@ -2276,16 +2276,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     },
     {
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/uevent.h"
   },
   {
@@ -2294,19 +2294,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     },
     {
      "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/uevent.h"
   },
   {
@@ -2315,22 +2315,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     },
     {
      "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-84"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/uevent.h"
   },
   {
@@ -2339,13 +2339,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-84"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/uevent.h"
   }
  ],
@@ -2354,19 +2354,19 @@
   {
    "linker_set_key" : "atrace_enabled_tags",
    "name" : "atrace_enabled_tags",
-   "referenced_type" : "type-16",
+   "referenced_type" : "type-85",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
    "linker_set_key" : "atrace_is_ready",
    "name" : "atrace_is_ready",
-   "referenced_type" : "type-61",
+   "referenced_type" : "type-116",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
    "linker_set_key" : "atrace_marker_fd",
    "name" : "atrace_marker_fd",
-   "referenced_type" : "type-18",
+   "referenced_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   }
  ],
@@ -2377,8 +2377,8 @@
    "alignment" : 4,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-108",
-   "self_type" : "type-107",
+   "referenced_type" : "type-103",
+   "self_type" : "type-102",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2386,8 +2386,8 @@
    "alignment" : 4,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-42",
-   "self_type" : "type-41",
+   "referenced_type" : "type-153",
+   "self_type" : "type-152",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2395,8 +2395,8 @@
    "alignment" : 4,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-64",
-   "self_type" : "type-63",
+   "referenced_type" : "type-36",
+   "self_type" : "type-35",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2404,8 +2404,8 @@
    "alignment" : 4,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-76",
+   "referenced_type" : "type-66",
+   "self_type" : "type-65",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2413,8 +2413,8 @@
    "alignment" : 4,
    "linker_set_key" : "IoSchedClass *",
    "name" : "IoSchedClass *",
-   "referenced_type" : "type-10",
-   "self_type" : "type-9",
+   "referenced_type" : "type-8",
+   "self_type" : "type-7",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/iosched_policy.h"
   },
@@ -2422,8 +2422,8 @@
    "alignment" : 4,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-100",
-   "self_type" : "type-99",
+   "referenced_type" : "type-140",
+   "self_type" : "type-139",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2431,8 +2431,8 @@
    "alignment" : 4,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-113",
-   "self_type" : "type-112",
+   "referenced_type" : "type-145",
+   "self_type" : "type-144",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2440,8 +2440,8 @@
    "alignment" : 4,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-26",
-   "self_type" : "type-25",
+   "referenced_type" : "type-20",
+   "self_type" : "type-19",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2449,8 +2449,8 @@
    "alignment" : 4,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-74",
-   "self_type" : "type-73",
+   "referenced_type" : "type-56",
+   "self_type" : "type-55",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2458,8 +2458,8 @@
    "alignment" : 4,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-85",
-   "self_type" : "type-84",
+   "referenced_type" : "type-94",
+   "self_type" : "type-93",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2467,8 +2467,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(void *, void *)",
    "name" : "bool (*)(void *, void *)",
-   "referenced_type" : "type-44",
-   "self_type" : "type-43",
+   "referenced_type" : "type-38",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2476,8 +2476,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(void *, void *, void *)",
    "name" : "bool (*)(void *, void *, void *)",
-   "referenced_type" : "type-46",
-   "self_type" : "type-48",
+   "referenced_type" : "type-40",
+   "self_type" : "type-42",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2486,7 +2486,7 @@
    "linker_set_key" : "char *",
    "name" : "char *",
    "referenced_type" : "type-5",
-   "self_type" : "type-51",
+   "self_type" : "type-45",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/config_utils.h"
   },
@@ -2494,8 +2494,8 @@
    "alignment" : 4,
    "linker_set_key" : "char16_t *",
    "name" : "char16_t *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-34",
+   "referenced_type" : "type-26",
+   "self_type" : "type-28",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
@@ -2521,8 +2521,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-31",
-   "self_type" : "type-33",
+   "referenced_type" : "type-25",
+   "self_type" : "type-27",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
@@ -2530,8 +2530,8 @@
    "alignment" : 4,
    "linker_set_key" : "const cutils_socket_buffer_t *",
    "name" : "const cutils_socket_buffer_t *",
-   "referenced_type" : "type-52",
-   "self_type" : "type-53",
+   "referenced_type" : "type-71",
+   "self_type" : "type-72",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
@@ -2539,8 +2539,8 @@
    "alignment" : 4,
    "linker_set_key" : "const iovec *",
    "name" : "const iovec *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-60",
+   "referenced_type" : "type-113",
+   "self_type" : "type-115",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2548,8 +2548,8 @@
    "alignment" : 4,
    "linker_set_key" : "const iovec *",
    "name" : "const iovec *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-88",
+   "referenced_type" : "type-121",
+   "self_type" : "type-124",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2557,8 +2557,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-23",
+   "referenced_type" : "type-16",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
@@ -2566,8 +2566,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-30",
-   "self_type" : "type-29",
+   "referenced_type" : "type-24",
+   "self_type" : "type-23",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
@@ -2575,8 +2575,8 @@
    "alignment" : 4,
    "linker_set_key" : "float *",
    "name" : "float *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-76",
+   "self_type" : "type-75",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
@@ -2584,8 +2584,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-49",
-   "self_type" : "type-50",
+   "referenced_type" : "type-43",
+   "self_type" : "type-44",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2593,8 +2593,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-18",
-   "self_type" : "type-17",
+   "referenced_type" : "type-10",
+   "self_type" : "type-9",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/iosched_policy.h"
   },
@@ -2602,8 +2602,8 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-24",
+   "referenced_type" : "type-14",
+   "self_type" : "type-18",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
@@ -2611,8 +2611,8 @@
    "alignment" : 4,
    "linker_set_key" : "str_parms *",
    "name" : "str_parms *",
-   "referenced_type" : "type-55",
-   "self_type" : "type-54",
+   "referenced_type" : "type-111",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
@@ -2620,8 +2620,8 @@
    "alignment" : 4,
    "linker_set_key" : "str_parms *",
    "name" : "str_parms *",
-   "referenced_type" : "type-70",
-   "self_type" : "type-69",
+   "referenced_type" : "type-118",
+   "self_type" : "type-117",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
@@ -2629,8 +2629,8 @@
    "alignment" : 4,
    "linker_set_key" : "str_parms *",
    "name" : "str_parms *",
-   "referenced_type" : "type-83",
-   "self_type" : "type-82",
+   "referenced_type" : "type-74",
+   "self_type" : "type-73",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
@@ -2638,8 +2638,8 @@
    "alignment" : 4,
    "linker_set_key" : "thread_store_t *",
    "name" : "thread_store_t *",
-   "referenced_type" : "type-35",
-   "self_type" : "type-37",
+   "referenced_type" : "type-29",
+   "self_type" : "type-31",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   },
@@ -2648,7 +2648,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-6",
-   "self_type" : "type-19",
+   "self_type" : "type-13",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/misc.h"
   },
@@ -2656,8 +2656,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(const char *, const char *, void *)",
    "name" : "void (*)(const char *, const char *, void *)",
-   "referenced_type" : "type-11",
-   "self_type" : "type-14",
+   "referenced_type" : "type-80",
+   "self_type" : "type-83",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
@@ -2665,8 +2665,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(void *)",
    "name" : "void (*)(void *)",
-   "referenced_type" : "type-38",
-   "self_type" : "type-39",
+   "referenced_type" : "type-32",
+   "self_type" : "type-33",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   },
@@ -2675,7 +2675,7 @@
    "linker_set_key" : "void *",
    "name" : "void *",
    "referenced_type" : "type-12",
-   "self_type" : "type-13",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/misc.h"
   },
@@ -2683,8 +2683,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-13",
-   "self_type" : "type-27",
+   "referenced_type" : "type-11",
+   "self_type" : "type-21",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   }
@@ -2706,8 +2706,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-32",
-   "self_type" : "type-31",
+   "referenced_type" : "type-26",
+   "self_type" : "type-25",
    "size" : 2,
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
@@ -2716,8 +2716,8 @@
    "is_const" : true,
    "linker_set_key" : "const cutils_socket_buffer_t",
    "name" : "const cutils_socket_buffer_t",
-   "referenced_type" : "type-28",
-   "self_type" : "type-52",
+   "referenced_type" : "type-22",
+   "self_type" : "type-71",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
@@ -2726,8 +2726,8 @@
    "is_const" : true,
    "linker_set_key" : "const iovec",
    "name" : "const iovec",
-   "referenced_type" : "type-59",
-   "self_type" : "type-58",
+   "referenced_type" : "type-114",
+   "self_type" : "type-113",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2736,8 +2736,8 @@
    "is_const" : true,
    "linker_set_key" : "const iovec",
    "name" : "const iovec",
-   "referenced_type" : "type-87",
-   "self_type" : "type-86",
+   "referenced_type" : "type-122",
+   "self_type" : "type-121",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2746,8 +2746,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-20",
-   "self_type" : "type-22",
+   "referenced_type" : "type-14",
+   "self_type" : "type-16",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
@@ -2756,7 +2756,7 @@
    "linker_set_key" : "const void",
    "name" : "const void",
    "referenced_type" : "type-12",
-   "self_type" : "type-30",
+   "self_type" : "type-24",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   }
  ],
@@ -2805,7 +2805,7 @@
    [
     {
      "field_name" : "data",
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "length",
@@ -2815,8 +2815,8 @@
    ],
    "linker_set_key" : "cutils_socket_buffer_t",
    "name" : "cutils_socket_buffer_t",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h",
    "unique_id" : "cutils_socket_buffer_t"
@@ -2827,28 +2827,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-15"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -2859,23 +2859,23 @@
    [
     {
      "field_name" : "lock",
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-30"
     },
     {
      "field_name" : "has_tls",
      "field_offset" : 32,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
      "field_name" : "tls",
      "field_offset" : 64,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
    "linker_set_key" : "thread_store_t",
    "name" : "thread_store_t",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/threads.h",
    "unique_id" : "thread_store_t"
diff --git a/Q/32/arm_armv7-a-neon/source-based/libprocessgroup.so.lsdump b/Q/32/arm_armv7-a-neon/source-based/libprocessgroup.so.lsdump
index d440dc4..c7f813e 100644
--- a/Q/32/arm_armv7-a-neon/source-based/libprocessgroup.so.lsdump
+++ b/Q/32/arm_armv7-a-neon/source-based/libprocessgroup.so.lsdump
@@ -8,8 +8,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
+   "referenced_type" : "type-5",
+   "self_type" : "type-5",
    "size" : 1
   },
   {
@@ -26,8 +26,8 @@
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 8
   },
   {
@@ -35,8 +35,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 4
   },
   {
@@ -61,8 +61,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 8
   },
   {
@@ -80,8 +80,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
    "size" : 1
   },
   {
@@ -120,15 +120,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-18",
-   "self_type" : "type-18",
+   "referenced_type" : "type-17",
+   "self_type" : "type-17",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-6",
-   "self_type" : "type-6"
+   "referenced_type" : "type-15",
+   "self_type" : "type-15"
   }
  ],
  "elf_functions" :
@@ -149,7 +149,31 @@
    "name" : "SetTaskProfiles"
   },
   {
-   "name" : "UsePerAppMemcg"
+   "name" : "_Z14UsePerAppMemcgv"
+  },
+  {
+   "name" : "_Z16killProcessGroupjii"
+  },
+  {
+   "name" : "_Z18createProcessGroupjib"
+  },
+  {
+   "name" : "_Z20killProcessGroupOncejii"
+  },
+  {
+   "name" : "_Z20setProcessGroupLimitjix"
+  },
+  {
+   "name" : "_Z22removeAllProcessGroupsv"
+  },
+  {
+   "name" : "_Z24setProcessGroupSoftLimitjix"
+  },
+  {
+   "name" : "_Z25setProcessGroupSwappinessjii"
+  },
+  {
+   "name" : "_ZN11TaskProfile21EnableResourceCachingEv"
   },
   {
    "name" : "_ZN12TaskProfiles11GetInstanceEv"
@@ -170,6 +194,9 @@
    "name" : "_ZN15SetCgroupAction18IsAppDependentPathERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
   },
   {
+   "name" : "_ZN15SetCgroupAction21EnableResourceCachingEv"
+  },
+  {
    "name" : "_ZN15SetCgroupActionC1ERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE"
   },
   {
@@ -733,36 +760,15 @@
    "name" : "cpusets_enabled"
   },
   {
-   "name" : "createProcessGroup"
-  },
-  {
    "name" : "get_sched_policy"
   },
   {
    "name" : "get_sched_policy_name"
   },
   {
-   "name" : "killProcessGroup"
-  },
-  {
-   "name" : "killProcessGroupOnce"
-  },
-  {
-   "name" : "removeAllProcessGroups"
-  },
-  {
    "name" : "schedboost_enabled"
   },
   {
-   "name" : "setProcessGroupLimit"
-  },
-  {
-   "name" : "setProcessGroupSoftLimit"
-  },
-  {
-   "name" : "setProcessGroupSwappiness"
-  },
-  {
    "name" : "set_cpuset_policy"
   },
   {
@@ -937,11 +943,11 @@
    ],
    "linker_set_key" : "SchedPolicy",
    "name" : "SchedPolicy",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
+   "referenced_type" : "type-11",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h",
-   "underlying_type" : "type-14",
+   "underlying_type" : "type-12",
    "unique_id" : "SchedPolicy"
   }
  ],
@@ -954,13 +960,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -969,16 +975,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -987,13 +993,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -1005,13 +1011,17 @@
      "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
      "referenced_type" : "type-35"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-5"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -1020,59 +1030,38 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
      "referenced_type" : "type-35"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-5"
     }
    ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "UsePerAppMemcg",
-   "linker_set_key" : "UsePerAppMemcg",
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
    "function_name" : "cpusets_enabled",
    "linker_set_key" : "cpusets_enabled",
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
-   "function_name" : "createProcessGroup",
-   "linker_set_key" : "createProcessGroup",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
    "function_name" : "get_sched_policy",
    "linker_set_key" : "get_sched_policy",
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
@@ -1081,127 +1070,31 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
    "return_type" : "type-1",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
-   "function_name" : "killProcessGroup",
-   "linker_set_key" : "killProcessGroup",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "killProcessGroupOnce",
-   "linker_set_key" : "killProcessGroupOnce",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "removeAllProcessGroups",
-   "linker_set_key" : "removeAllProcessGroups",
-   "return_type" : "type-6",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
    "function_name" : "schedboost_enabled",
    "linker_set_key" : "schedboost_enabled",
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
-   "function_name" : "setProcessGroupLimit",
-   "linker_set_key" : "setProcessGroupLimit",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-5"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "setProcessGroupSoftLimit",
-   "linker_set_key" : "setProcessGroupSoftLimit",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-5"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "setProcessGroupSwappiness",
-   "linker_set_key" : "setProcessGroupSwappiness",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
    "function_name" : "set_cpuset_policy",
    "linker_set_key" : "set_cpuset_policy",
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
@@ -1210,13 +1103,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   }
  ],
@@ -1236,8 +1129,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-8",
-   "self_type" : "type-10",
+   "referenced_type" : "type-6",
+   "self_type" : "type-8",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
@@ -1266,8 +1159,8 @@
    "alignment" : 4,
    "linker_set_key" : "SchedPolicy *",
    "name" : "SchedPolicy *",
-   "referenced_type" : "type-13",
-   "self_type" : "type-15",
+   "referenced_type" : "type-11",
+   "self_type" : "type-13",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
@@ -1284,8 +1177,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
+   "referenced_type" : "type-10",
+   "self_type" : "type-9",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
@@ -1336,8 +1229,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-9",
-   "self_type" : "type-8",
+   "referenced_type" : "type-7",
+   "self_type" : "type-6",
    "size" : 12,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
diff --git a/Q/32/x86/source-based/libcutils.so.lsdump b/Q/32/x86/source-based/libcutils.so.lsdump
index 9e865ad..33bb1f3 100644
--- a/Q/32/x86/source-based/libcutils.so.lsdump
+++ b/Q/32/x86/source-based/libcutils.so.lsdump
@@ -18,8 +18,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 1
   },
   {
@@ -37,16 +37,16 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-56",
-   "self_type" : "type-56",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 2
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 4
   },
   {
@@ -63,8 +63,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 8
   },
   {
@@ -72,8 +72,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 1
   },
   {
@@ -92,8 +92,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 8
   },
   {
@@ -102,8 +102,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-34",
+   "self_type" : "type-34",
    "size" : 2
   },
   {
@@ -545,9 +545,9 @@
      "referenced_type" : "type-11"
     }
    ],
-   "referenced_type" : "type-68",
-   "return_type" : "type-69",
-   "self_type" : "type-68",
+   "referenced_type" : "type-38",
+   "return_type" : "type-39",
+   "self_type" : "type-38",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -566,9 +566,9 @@
      "referenced_type" : "type-11"
     }
    ],
-   "referenced_type" : "type-70",
-   "return_type" : "type-71",
-   "self_type" : "type-70",
+   "referenced_type" : "type-40",
+   "return_type" : "type-41",
+   "self_type" : "type-40",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -581,9 +581,9 @@
      "referenced_type" : "type-11"
     }
    ],
-   "referenced_type" : "type-73",
+   "referenced_type" : "type-43",
    "return_type" : "type-10",
-   "self_type" : "type-73",
+   "self_type" : "type-43",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -602,9 +602,9 @@
      "referenced_type" : "type-11"
     }
    ],
-   "referenced_type" : "type-40",
+   "referenced_type" : "type-58",
    "return_type" : "type-12",
-   "self_type" : "type-40",
+   "self_type" : "type-58",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -617,9 +617,9 @@
      "referenced_type" : "type-11"
     }
    ],
-   "referenced_type" : "type-62",
+   "referenced_type" : "type-32",
    "return_type" : "type-12",
-   "self_type" : "type-62",
+   "self_type" : "type-32",
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   }
  ],
@@ -856,7 +856,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-57"
     }
    ],
    "return_type" : "type-12",
@@ -883,7 +883,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-61"
     }
    ],
    "return_type" : "type-12",
@@ -895,7 +895,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-61"
     }
    ],
    "return_type" : "type-12",
@@ -967,7 +967,7 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-45"
     }
    ],
    "return_type" : "type-12",
@@ -1048,7 +1048,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-34"
     }
    ],
    "return_type" : "type-10",
@@ -1063,7 +1063,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-34"
     },
     {
      "referenced_type" : "type-6"
@@ -1084,7 +1084,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-34"
     },
     {
      "referenced_type" : "type-6"
@@ -1105,7 +1105,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-34"
     },
     {
      "referenced_type" : "type-6"
@@ -1156,13 +1156,13 @@
      "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-65",
+   "return_type" : "type-35",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1171,10 +1171,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-35"
     },
     {
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-42"
     },
     {
      "referenced_type" : "type-11"
@@ -1189,7 +1189,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-35"
     }
    ],
    "return_type" : "type-12",
@@ -1201,7 +1201,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-35"
     },
     {
      "referenced_type" : "type-11"
@@ -1231,7 +1231,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-35"
     }
    ],
    "return_type" : "type-12",
@@ -1243,7 +1243,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-35"
     },
     {
      "referenced_type" : "type-11"
@@ -1261,7 +1261,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-35"
     },
     {
      "referenced_type" : "type-11"
@@ -1276,7 +1276,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-35"
     }
    ],
    "return_type" : "type-12",
@@ -1318,7 +1318,7 @@
      "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-37"
+     "referenced_type" : "type-54"
     },
     {
      "referenced_type" : "type-10"
@@ -1510,7 +1510,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-45"
     },
     {
      "referenced_type" : "type-10"
@@ -1543,7 +1543,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-45"
     },
     {
      "referenced_type" : "type-3"
@@ -1561,10 +1561,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-56"
     }
    ],
-   "return_type" : "type-38",
+   "return_type" : "type-56",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1591,10 +1591,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-57"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-57",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1603,7 +1603,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-60"
     },
     {
      "referenced_type" : "type-11"
@@ -1837,7 +1837,7 @@
      "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-28"
+     "referenced_type" : "type-87"
     },
     {
      "referenced_type" : "type-6"
@@ -1867,13 +1867,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-46"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-49"
     }
    ],
    "return_type" : "type-10",
@@ -1885,7 +1885,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-46"
     },
     {
      "referenced_type" : "type-3"
@@ -1903,7 +1903,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-46"
     },
     {
      "referenced_type" : "type-3"
@@ -1918,7 +1918,7 @@
   {
    "function_name" : "str_parms_create",
    "linker_set_key" : "str_parms_create",
-   "return_type" : "type-30",
+   "return_type" : "type-46",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1930,7 +1930,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-30",
+   "return_type" : "type-46",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1939,7 +1939,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-46"
     },
     {
      "referenced_type" : "type-3"
@@ -1954,7 +1954,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-46"
     }
    ],
    "return_type" : "type-12",
@@ -1966,7 +1966,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-46"
     }
    ],
    "return_type" : "type-12",
@@ -1978,13 +1978,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-46"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-32"
+     "referenced_type" : "type-48"
     }
    ],
    "return_type" : "type-10",
@@ -1996,7 +1996,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-46"
     },
     {
      "referenced_type" : "type-3"
@@ -2014,13 +2014,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-46"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-45"
     },
     {
      "referenced_type" : "type-10"
@@ -2035,7 +2035,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-46"
     },
     {
      "referenced_type" : "type-3"
@@ -2050,10 +2050,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-46"
     }
    ],
-   "return_type" : "type-25",
+   "return_type" : "type-45",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2062,7 +2062,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-58"
+     "referenced_type" : "type-28"
     },
     {
      "referenced_type" : "type-3"
@@ -2071,7 +2071,7 @@
      "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-58",
+   "return_type" : "type-28",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2080,7 +2080,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-58"
+     "referenced_type" : "type-28"
     },
     {
      "referenced_type" : "type-3"
@@ -2092,7 +2092,7 @@
      "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-58",
+   "return_type" : "type-28",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2107,7 +2107,7 @@
      "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-58",
+   "return_type" : "type-28",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2128,16 +2128,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-57"
+     "referenced_type" : "type-27"
     },
     {
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-25",
+   "return_type" : "type-45",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2146,13 +2146,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-57"
+     "referenced_type" : "type-27"
     },
     {
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-25",
+   "return_type" : "type-45",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2161,7 +2161,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-57"
+     "referenced_type" : "type-27"
     },
     {
      "referenced_type" : "type-6"
@@ -2176,7 +2176,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-31"
     }
    ],
    "return_type" : "type-11",
@@ -2188,13 +2188,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-31"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-63"
+     "referenced_type" : "type-33"
     }
    ],
    "return_type" : "type-12",
@@ -2254,7 +2254,7 @@
      "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-61"
     },
     {
      "referenced_type" : "type-13"
@@ -2272,7 +2272,7 @@
      "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-61"
     }
    ],
    "return_type" : "type-10",
@@ -2284,13 +2284,13 @@
   {
    "linker_set_key" : "atrace_enabled_tags",
    "name" : "atrace_enabled_tags",
-   "referenced_type" : "type-44",
+   "referenced_type" : "type-62",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
    "linker_set_key" : "atrace_is_ready",
    "name" : "atrace_is_ready",
-   "referenced_type" : "type-80",
+   "referenced_type" : "type-88",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
@@ -2307,8 +2307,8 @@
    "alignment" : 4,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-100",
+   "referenced_type" : "type-109",
+   "self_type" : "type-108",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2316,8 +2316,8 @@
    "alignment" : 4,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-132",
-   "self_type" : "type-131",
+   "referenced_type" : "type-140",
+   "self_type" : "type-139",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2325,8 +2325,8 @@
    "alignment" : 4,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-66",
-   "self_type" : "type-65",
+   "referenced_type" : "type-36",
+   "self_type" : "type-35",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2334,8 +2334,8 @@
    "alignment" : 4,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-78",
+   "referenced_type" : "type-82",
+   "self_type" : "type-81",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2352,8 +2352,8 @@
    "alignment" : 4,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-122",
-   "self_type" : "type-121",
+   "referenced_type" : "type-130",
+   "self_type" : "type-129",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2370,8 +2370,8 @@
    "alignment" : 4,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-52",
-   "self_type" : "type-51",
+   "referenced_type" : "type-70",
+   "self_type" : "type-69",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2379,8 +2379,8 @@
    "alignment" : 4,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-76",
+   "referenced_type" : "type-74",
+   "self_type" : "type-73",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2388,8 +2388,8 @@
    "alignment" : 4,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-90",
+   "referenced_type" : "type-99",
+   "self_type" : "type-98",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2397,8 +2397,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(void *, void *)",
    "name" : "bool (*)(void *, void *)",
-   "referenced_type" : "type-68",
-   "self_type" : "type-67",
+   "referenced_type" : "type-38",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2406,8 +2406,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(void *, void *, void *)",
    "name" : "bool (*)(void *, void *, void *)",
-   "referenced_type" : "type-70",
-   "self_type" : "type-72",
+   "referenced_type" : "type-40",
+   "self_type" : "type-42",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2416,7 +2416,7 @@
    "linker_set_key" : "char *",
    "name" : "char *",
    "referenced_type" : "type-5",
-   "self_type" : "type-25",
+   "self_type" : "type-45",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/config_utils.h"
   },
@@ -2424,8 +2424,8 @@
    "alignment" : 4,
    "linker_set_key" : "char16_t *",
    "name" : "char16_t *",
-   "referenced_type" : "type-56",
-   "self_type" : "type-58",
+   "referenced_type" : "type-26",
+   "self_type" : "type-28",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
@@ -2451,8 +2451,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-55",
-   "self_type" : "type-57",
+   "referenced_type" : "type-25",
+   "self_type" : "type-27",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
@@ -2460,8 +2460,8 @@
    "alignment" : 4,
    "linker_set_key" : "const cutils_socket_buffer_t *",
    "name" : "const cutils_socket_buffer_t *",
-   "referenced_type" : "type-27",
-   "self_type" : "type-28",
+   "referenced_type" : "type-86",
+   "self_type" : "type-87",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
@@ -2469,8 +2469,8 @@
    "alignment" : 4,
    "linker_set_key" : "const iovec *",
    "name" : "const iovec *",
-   "referenced_type" : "type-142",
-   "self_type" : "type-144",
+   "referenced_type" : "type-150",
+   "self_type" : "type-152",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2478,8 +2478,8 @@
    "alignment" : 4,
    "linker_set_key" : "const iovec *",
    "name" : "const iovec *",
-   "referenced_type" : "type-35",
-   "self_type" : "type-37",
+   "referenced_type" : "type-51",
+   "self_type" : "type-54",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2505,8 +2505,8 @@
    "alignment" : 4,
    "linker_set_key" : "float *",
    "name" : "float *",
-   "referenced_type" : "type-33",
-   "self_type" : "type-32",
+   "referenced_type" : "type-49",
+   "self_type" : "type-48",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
@@ -2514,8 +2514,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-73",
-   "self_type" : "type-74",
+   "referenced_type" : "type-43",
+   "self_type" : "type-44",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2541,8 +2541,8 @@
    "alignment" : 4,
    "linker_set_key" : "str_parms *",
    "name" : "str_parms *",
-   "referenced_type" : "type-109",
-   "self_type" : "type-108",
+   "referenced_type" : "type-117",
+   "self_type" : "type-116",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
@@ -2550,8 +2550,8 @@
    "alignment" : 4,
    "linker_set_key" : "str_parms *",
    "name" : "str_parms *",
-   "referenced_type" : "type-140",
-   "self_type" : "type-139",
+   "referenced_type" : "type-148",
+   "self_type" : "type-147",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
@@ -2559,8 +2559,8 @@
    "alignment" : 4,
    "linker_set_key" : "str_parms *",
    "name" : "str_parms *",
-   "referenced_type" : "type-31",
-   "self_type" : "type-30",
+   "referenced_type" : "type-47",
+   "self_type" : "type-46",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
@@ -2568,8 +2568,8 @@
    "alignment" : 4,
    "linker_set_key" : "thread_store_t *",
    "name" : "thread_store_t *",
-   "referenced_type" : "type-59",
-   "self_type" : "type-61",
+   "referenced_type" : "type-29",
+   "self_type" : "type-31",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   },
@@ -2586,8 +2586,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(const char *, const char *, void *)",
    "name" : "void (*)(const char *, const char *, void *)",
-   "referenced_type" : "type-40",
-   "self_type" : "type-42",
+   "referenced_type" : "type-58",
+   "self_type" : "type-60",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
@@ -2595,8 +2595,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(void *)",
    "name" : "void (*)(void *)",
-   "referenced_type" : "type-62",
-   "self_type" : "type-63",
+   "referenced_type" : "type-32",
+   "self_type" : "type-33",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   },
@@ -2636,8 +2636,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-56",
-   "self_type" : "type-55",
+   "referenced_type" : "type-26",
+   "self_type" : "type-25",
    "size" : 2,
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
@@ -2647,7 +2647,7 @@
    "linker_set_key" : "const cutils_socket_buffer_t",
    "name" : "const cutils_socket_buffer_t",
    "referenced_type" : "type-22",
-   "self_type" : "type-27",
+   "self_type" : "type-86",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
@@ -2656,8 +2656,8 @@
    "is_const" : true,
    "linker_set_key" : "const iovec",
    "name" : "const iovec",
-   "referenced_type" : "type-143",
-   "self_type" : "type-142",
+   "referenced_type" : "type-151",
+   "self_type" : "type-150",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2666,8 +2666,8 @@
    "is_const" : true,
    "linker_set_key" : "const iovec",
    "name" : "const iovec",
-   "referenced_type" : "type-36",
-   "self_type" : "type-35",
+   "referenced_type" : "type-52",
+   "self_type" : "type-51",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2789,7 +2789,7 @@
    [
     {
      "field_name" : "lock",
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-30"
     },
     {
      "field_name" : "has_tls",
@@ -2804,8 +2804,8 @@
    ],
    "linker_set_key" : "thread_store_t",
    "name" : "thread_store_t",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/threads.h",
    "unique_id" : "thread_store_t"
diff --git a/Q/32/x86/source-based/libprocessgroup.so.lsdump b/Q/32/x86/source-based/libprocessgroup.so.lsdump
index 1b73438..f5753e4 100644
--- a/Q/32/x86/source-based/libprocessgroup.so.lsdump
+++ b/Q/32/x86/source-based/libprocessgroup.so.lsdump
@@ -8,8 +8,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
+   "referenced_type" : "type-5",
+   "self_type" : "type-5",
    "size" : 1
   },
   {
@@ -26,34 +26,19 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 4
   },
   {
    "alignment" : 4,
    "is_integral" : true,
-   "linker_set_key" : "long long",
-   "name" : "long long",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
-   "size" : 8
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
    "referenced_type" : "type-4",
    "self_type" : "type-4",
    "size" : 4
-  },
-  {
-   "linker_set_key" : "void",
-   "name" : "void",
-   "referenced_type" : "type-6",
-   "self_type" : "type-6"
   }
  ],
  "elf_functions" :
@@ -74,7 +59,31 @@
    "name" : "SetTaskProfiles"
   },
   {
-   "name" : "UsePerAppMemcg"
+   "name" : "_Z14UsePerAppMemcgv"
+  },
+  {
+   "name" : "_Z16killProcessGroupjii"
+  },
+  {
+   "name" : "_Z18createProcessGroupjib"
+  },
+  {
+   "name" : "_Z20killProcessGroupOncejii"
+  },
+  {
+   "name" : "_Z20setProcessGroupLimitjix"
+  },
+  {
+   "name" : "_Z22removeAllProcessGroupsv"
+  },
+  {
+   "name" : "_Z24setProcessGroupSoftLimitjix"
+  },
+  {
+   "name" : "_Z25setProcessGroupSwappinessjii"
+  },
+  {
+   "name" : "_ZN11TaskProfile21EnableResourceCachingEv"
   },
   {
    "name" : "_ZN12TaskProfiles11GetInstanceEv"
@@ -95,6 +104,9 @@
    "name" : "_ZN15SetCgroupAction18IsAppDependentPathERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
   },
   {
+   "name" : "_ZN15SetCgroupAction21EnableResourceCachingEv"
+  },
+  {
    "name" : "_ZN15SetCgroupActionC1ERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE"
   },
   {
@@ -601,36 +613,15 @@
    "name" : "cpusets_enabled"
   },
   {
-   "name" : "createProcessGroup"
-  },
-  {
    "name" : "get_sched_policy"
   },
   {
    "name" : "get_sched_policy_name"
   },
   {
-   "name" : "killProcessGroup"
-  },
-  {
-   "name" : "killProcessGroupOnce"
-  },
-  {
-   "name" : "removeAllProcessGroups"
-  },
-  {
    "name" : "schedboost_enabled"
   },
   {
-   "name" : "setProcessGroupLimit"
-  },
-  {
-   "name" : "setProcessGroupSoftLimit"
-  },
-  {
-   "name" : "setProcessGroupSwappiness"
-  },
-  {
    "name" : "set_cpuset_policy"
   },
   {
@@ -805,11 +796,11 @@
    ],
    "linker_set_key" : "SchedPolicy",
    "name" : "SchedPolicy",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
+   "referenced_type" : "type-11",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h",
-   "underlying_type" : "type-14",
+   "underlying_type" : "type-12",
    "unique_id" : "SchedPolicy"
   }
  ],
@@ -822,13 +813,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -837,16 +828,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -855,13 +846,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -873,13 +864,17 @@
      "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-17"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-5"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -888,59 +883,38 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-17"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-5"
     }
    ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "UsePerAppMemcg",
-   "linker_set_key" : "UsePerAppMemcg",
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
    "function_name" : "cpusets_enabled",
    "linker_set_key" : "cpusets_enabled",
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
-   "function_name" : "createProcessGroup",
-   "linker_set_key" : "createProcessGroup",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
    "function_name" : "get_sched_policy",
    "linker_set_key" : "get_sched_policy",
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
@@ -949,127 +923,31 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
    "return_type" : "type-1",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
-   "function_name" : "killProcessGroup",
-   "linker_set_key" : "killProcessGroup",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "killProcessGroupOnce",
-   "linker_set_key" : "killProcessGroupOnce",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "removeAllProcessGroups",
-   "linker_set_key" : "removeAllProcessGroups",
-   "return_type" : "type-6",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
    "function_name" : "schedboost_enabled",
    "linker_set_key" : "schedboost_enabled",
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
-   "function_name" : "setProcessGroupLimit",
-   "linker_set_key" : "setProcessGroupLimit",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-5"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "setProcessGroupSoftLimit",
-   "linker_set_key" : "setProcessGroupSoftLimit",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-5"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "setProcessGroupSwappiness",
-   "linker_set_key" : "setProcessGroupSwappiness",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
    "function_name" : "set_cpuset_policy",
    "linker_set_key" : "set_cpuset_policy",
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
@@ -1078,13 +956,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   }
  ],
@@ -1095,8 +973,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-8",
-   "self_type" : "type-10",
+   "referenced_type" : "type-6",
+   "self_type" : "type-8",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
@@ -1104,8 +982,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
    "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
-   "referenced_type" : "type-17",
-   "self_type" : "type-19",
+   "referenced_type" : "type-15",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   }
@@ -1116,8 +994,8 @@
    "alignment" : 4,
    "linker_set_key" : "SchedPolicy *",
    "name" : "SchedPolicy *",
-   "referenced_type" : "type-13",
-   "self_type" : "type-15",
+   "referenced_type" : "type-11",
+   "self_type" : "type-13",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
@@ -1134,8 +1012,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
+   "referenced_type" : "type-10",
+   "self_type" : "type-9",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   }
@@ -1158,7 +1036,7 @@
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
    "referenced_type" : "type-1",
-   "self_type" : "type-16",
+   "self_type" : "type-14",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
@@ -1167,8 +1045,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-9",
-   "self_type" : "type-8",
+   "referenced_type" : "type-7",
+   "self_type" : "type-6",
    "size" : 12,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
@@ -1177,8 +1055,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
    "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
-   "referenced_type" : "type-18",
-   "self_type" : "type-17",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 12,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   }
diff --git a/Q/64/arm64_armv8-a/source-based/libcutils.so.lsdump b/Q/64/arm64_armv8-a/source-based/libcutils.so.lsdump
index 9c2d745..2680b89 100644
--- a/Q/64/arm64_armv8-a/source-based/libcutils.so.lsdump
+++ b/Q/64/arm64_armv8-a/source-based/libcutils.so.lsdump
@@ -5,8 +5,8 @@
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-12",
-   "self_type" : "type-28",
+   "referenced_type" : "type-19",
+   "self_type" : "type-22",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   }
  ],
@@ -18,8 +18,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-46",
-   "self_type" : "type-46",
+   "referenced_type" : "type-17",
+   "self_type" : "type-17",
    "size" : 1
   },
   {
@@ -38,16 +38,16 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-35",
+   "self_type" : "type-35",
    "size" : 2
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 4
   },
   {
@@ -55,8 +55,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-19",
+   "self_type" : "type-19",
    "size" : 4
   },
   {
@@ -64,8 +64,8 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-15",
-   "self_type" : "type-15",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 8
   },
   {
@@ -73,8 +73,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
+   "referenced_type" : "type-10",
+   "self_type" : "type-10",
    "size" : 1
   },
   {
@@ -93,8 +93,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-28",
+   "self_type" : "type-28",
    "size" : 8
   },
   {
@@ -492,8 +492,8 @@
    ],
    "linker_set_key" : "IoSchedClass",
    "name" : "IoSchedClass",
-   "referenced_type" : "type-8",
-   "self_type" : "type-8",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/iosched_policy.h",
    "underlying_type" : "type-6",
@@ -509,15 +509,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-15"
     }
    ],
-   "referenced_type" : "type-64",
-   "return_type" : "type-65",
-   "self_type" : "type-64",
+   "referenced_type" : "type-46",
+   "return_type" : "type-47",
+   "self_type" : "type-46",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -527,18 +527,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-15"
     }
    ],
-   "referenced_type" : "type-66",
-   "return_type" : "type-67",
-   "self_type" : "type-66",
+   "referenced_type" : "type-48",
+   "return_type" : "type-49",
+   "self_type" : "type-48",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -548,12 +548,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-15"
     }
    ],
-   "referenced_type" : "type-69",
-   "return_type" : "type-12",
-   "self_type" : "type-69",
+   "referenced_type" : "type-51",
+   "return_type" : "type-19",
+   "self_type" : "type-51",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -569,12 +569,12 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-15"
     }
    ],
-   "referenced_type" : "type-44",
+   "referenced_type" : "type-13",
    "return_type" : "type-14",
-   "self_type" : "type-44",
+   "self_type" : "type-13",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -584,12 +584,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-15"
     }
    ],
-   "referenced_type" : "type-58",
+   "referenced_type" : "type-41",
    "return_type" : "type-14",
-   "self_type" : "type-58",
+   "self_type" : "type-41",
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   }
  ],
@@ -604,7 +604,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/android_get_control_file.h"
   },
   {
@@ -616,7 +616,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -625,16 +625,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-19"
     },
     {
      "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-18"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/iosched_policy.h"
   },
   {
@@ -646,13 +646,13 @@
      "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/android_reboot.h"
   },
   {
@@ -661,16 +661,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-8"
+     "referenced_type" : "type-19"
     },
     {
      "referenced_type" : "type-12"
+    },
+    {
+     "referenced_type" : "type-19"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/iosched_policy.h"
   },
   {
@@ -682,10 +682,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -694,10 +694,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -712,16 +712,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -730,13 +730,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -745,16 +745,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -763,10 +763,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -778,7 +778,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     }
    ],
    "return_type" : "type-14",
@@ -793,7 +793,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     }
    ],
    "return_type" : "type-14",
@@ -826,7 +826,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-54"
     }
    ],
    "return_type" : "type-14",
@@ -841,7 +841,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     }
    ],
    "return_type" : "type-14",
@@ -853,7 +853,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-17"
     }
    ],
    "return_type" : "type-14",
@@ -865,7 +865,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-17"
     }
    ],
    "return_type" : "type-14",
@@ -895,10 +895,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/config_utils.h"
   },
   {
@@ -937,7 +937,7 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-53"
     }
    ],
    "return_type" : "type-14",
@@ -1021,7 +1021,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1042,7 +1042,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1063,7 +1063,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1084,7 +1084,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1096,10 +1096,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-18"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1111,10 +1111,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1123,16 +1123,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-28"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-52"
     },
     {
-     "referenced_type" : "type-63"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-61",
+   "return_type" : "type-43",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1141,13 +1141,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-43"
     },
     {
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-15"
     }
    ],
    "return_type" : "type-14",
@@ -1159,7 +1159,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-43"
     }
    ],
    "return_type" : "type-14",
@@ -1171,13 +1171,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-43"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-15"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "type-15",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1186,13 +1186,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1201,7 +1201,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-43"
     }
    ],
    "return_type" : "type-14",
@@ -1213,16 +1213,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-43"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-15"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "type-15",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1231,13 +1231,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-43"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-15"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "type-15",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1246,7 +1246,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-43"
     }
    ],
    "return_type" : "type-14",
@@ -1258,7 +1258,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     }
    ],
    "return_type" : "type-14",
@@ -1270,7 +1270,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
      "referenced_type" : "type-3"
@@ -1285,13 +1285,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-7"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     }
    ],
    "return_type" : "type-14",
@@ -1306,10 +1306,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-20"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "type-15",
    "source_file" : "/system/core/libcutils/include/cutils/misc.h"
   },
   {
@@ -1429,10 +1429,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-24"
     }
    ],
-   "return_type" : "type-35",
+   "return_type" : "type-25",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1441,10 +1441,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-24"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1453,13 +1453,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     }
    ],
-   "return_type" : "type-35",
+   "return_type" : "type-25",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1468,10 +1468,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-25"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1480,16 +1480,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-53"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     }
    ],
-   "return_type" : "type-35",
+   "return_type" : "type-25",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1501,7 +1501,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/partition_utils.h"
   },
   {
@@ -1513,13 +1513,13 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-53"
     },
     {
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1531,10 +1531,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1546,10 +1546,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1561,10 +1561,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-54"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "type-54",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1573,13 +1573,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-15"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1594,7 +1594,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1603,7 +1603,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-26"
     }
    ],
    "return_type" : "type-14",
@@ -1615,16 +1615,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-26"
     },
     {
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
   {
@@ -1633,13 +1633,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-38",
+   "return_type" : "type-26",
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
   {
@@ -1648,10 +1648,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1660,10 +1660,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1672,13 +1672,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1690,13 +1690,13 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1705,19 +1705,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1729,13 +1729,13 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1744,16 +1744,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1765,13 +1765,13 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1783,19 +1783,19 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-18"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1804,16 +1804,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-56"
     },
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "type-54",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1822,13 +1822,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1837,16 +1837,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-57"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1855,16 +1855,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-57"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1873,7 +1873,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-57"
     },
     {
      "referenced_type" : "type-3"
@@ -1882,13 +1882,13 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
    "function_name" : "str_parms_create",
    "linker_set_key" : "str_parms_create",
-   "return_type" : "type-22",
+   "return_type" : "type-57",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1900,7 +1900,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-22",
+   "return_type" : "type-57",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1909,7 +1909,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-57"
     },
     {
      "referenced_type" : "type-3"
@@ -1924,7 +1924,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-57"
     }
    ],
    "return_type" : "type-14",
@@ -1936,7 +1936,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-57"
     }
    ],
    "return_type" : "type-14",
@@ -1948,16 +1948,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-57"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-59"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1966,16 +1966,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-57"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-18"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1984,19 +1984,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-57"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-53"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2005,13 +2005,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-57"
     },
     {
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2020,10 +2020,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-57"
     }
    ],
-   "return_type" : "type-60",
+   "return_type" : "type-53",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2032,16 +2032,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-37"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-54",
+   "return_type" : "type-37",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2050,19 +2050,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-37"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-54",
+   "return_type" : "type-37",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2074,10 +2074,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-54",
+   "return_type" : "type-37",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2089,7 +2089,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "type-28",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2098,16 +2098,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-60"
-    },
-    {
      "referenced_type" : "type-53"
     },
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-36"
+    },
+    {
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-60",
+   "return_type" : "type-53",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2116,13 +2116,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-36"
     },
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-60",
+   "return_type" : "type-53",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2131,13 +2131,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-36"
     },
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-20",
+   "return_type" : "type-28",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2146,10 +2146,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-57"
+     "referenced_type" : "type-40"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "type-15",
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   },
   {
@@ -2158,13 +2158,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-57"
+     "referenced_type" : "type-40"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-42"
     }
    ],
    "return_type" : "type-14",
@@ -2176,16 +2176,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-15"
     },
     {
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "type-54",
    "source_file" : "/system/core/libcutils/include/cutils/uevent.h"
   },
   {
@@ -2194,19 +2194,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-15"
+    },
+    {
+     "referenced_type" : "type-28"
     },
     {
      "referenced_type" : "type-20"
-    },
-    {
-     "referenced_type" : "type-26"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "type-54",
    "source_file" : "/system/core/libcutils/include/cutils/uevent.h"
   },
   {
@@ -2215,22 +2215,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-15"
+    },
+    {
+     "referenced_type" : "type-28"
+    },
+    {
+     "referenced_type" : "type-17"
     },
     {
      "referenced_type" : "type-20"
-    },
-    {
-     "referenced_type" : "type-46"
-    },
-    {
-     "referenced_type" : "type-26"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "type-54",
    "source_file" : "/system/core/libcutils/include/cutils/uevent.h"
   },
   {
@@ -2239,13 +2239,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-17"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/uevent.h"
   }
  ],
@@ -2254,19 +2254,19 @@
   {
    "linker_set_key" : "atrace_enabled_tags",
    "name" : "atrace_enabled_tags",
-   "referenced_type" : "type-20",
+   "referenced_type" : "type-28",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
    "linker_set_key" : "atrace_is_ready",
    "name" : "atrace_is_ready",
-   "referenced_type" : "type-73",
+   "referenced_type" : "type-61",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
    "linker_set_key" : "atrace_marker_fd",
    "name" : "atrace_marker_fd",
-   "referenced_type" : "type-12",
+   "referenced_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   }
  ],
@@ -2277,8 +2277,8 @@
    "alignment" : 8,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-10",
-   "self_type" : "type-9",
+   "referenced_type" : "type-114",
+   "self_type" : "type-113",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2286,8 +2286,8 @@
    "alignment" : 8,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-33",
-   "self_type" : "type-32",
+   "referenced_type" : "type-122",
+   "self_type" : "type-121",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2295,8 +2295,8 @@
    "alignment" : 8,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-62",
-   "self_type" : "type-61",
+   "referenced_type" : "type-44",
+   "self_type" : "type-43",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2304,8 +2304,8 @@
    "alignment" : 8,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-98",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2313,8 +2313,8 @@
    "alignment" : 8,
    "linker_set_key" : "IoSchedClass *",
    "name" : "IoSchedClass *",
-   "referenced_type" : "type-8",
-   "self_type" : "type-7",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/iosched_policy.h"
   },
@@ -2322,8 +2322,8 @@
    "alignment" : 8,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-30",
-   "self_type" : "type-29",
+   "referenced_type" : "type-103",
+   "self_type" : "type-102",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2331,8 +2331,8 @@
    "alignment" : 8,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-39",
-   "self_type" : "type-38",
+   "referenced_type" : "type-120",
+   "self_type" : "type-119",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2340,8 +2340,8 @@
    "alignment" : 8,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-50",
-   "self_type" : "type-49",
+   "referenced_type" : "type-27",
+   "self_type" : "type-26",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2358,8 +2358,8 @@
    "alignment" : 8,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-88",
-   "self_type" : "type-87",
+   "referenced_type" : "type-87",
+   "self_type" : "type-86",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2367,8 +2367,8 @@
    "alignment" : 8,
    "linker_set_key" : "bool (*)(void *, void *)",
    "name" : "bool (*)(void *, void *)",
-   "referenced_type" : "type-64",
-   "self_type" : "type-63",
+   "referenced_type" : "type-46",
+   "self_type" : "type-45",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2376,8 +2376,8 @@
    "alignment" : 8,
    "linker_set_key" : "bool (*)(void *, void *, void *)",
    "name" : "bool (*)(void *, void *, void *)",
-   "referenced_type" : "type-66",
-   "self_type" : "type-68",
+   "referenced_type" : "type-48",
+   "self_type" : "type-50",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2386,7 +2386,7 @@
    "linker_set_key" : "char *",
    "name" : "char *",
    "referenced_type" : "type-5",
-   "self_type" : "type-60",
+   "self_type" : "type-53",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/config_utils.h"
   },
@@ -2394,8 +2394,8 @@
    "alignment" : 8,
    "linker_set_key" : "char16_t *",
    "name" : "char16_t *",
-   "referenced_type" : "type-52",
-   "self_type" : "type-54",
+   "referenced_type" : "type-35",
+   "self_type" : "type-37",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
@@ -2421,8 +2421,8 @@
    "alignment" : 8,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-51",
-   "self_type" : "type-53",
+   "referenced_type" : "type-34",
+   "self_type" : "type-36",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
@@ -2430,8 +2430,8 @@
    "alignment" : 8,
    "linker_set_key" : "const cutils_socket_buffer_t *",
    "name" : "const cutils_socket_buffer_t *",
-   "referenced_type" : "type-16",
-   "self_type" : "type-21",
+   "referenced_type" : "type-55",
+   "self_type" : "type-56",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
@@ -2439,8 +2439,8 @@
    "alignment" : 8,
    "linker_set_key" : "const iovec *",
    "name" : "const iovec *",
-   "referenced_type" : "type-40",
-   "self_type" : "type-42",
+   "referenced_type" : "type-8",
+   "self_type" : "type-7",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2448,8 +2448,8 @@
    "alignment" : 8,
    "linker_set_key" : "const iovec *",
    "name" : "const iovec *",
-   "referenced_type" : "type-75",
-   "self_type" : "type-74",
+   "referenced_type" : "type-98",
+   "self_type" : "type-100",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2457,8 +2457,8 @@
    "alignment" : 8,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-31",
-   "self_type" : "type-34",
+   "referenced_type" : "type-23",
+   "self_type" : "type-24",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
@@ -2466,8 +2466,8 @@
    "alignment" : 8,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
+   "referenced_type" : "type-33",
+   "self_type" : "type-32",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
@@ -2475,8 +2475,8 @@
    "alignment" : 8,
    "linker_set_key" : "float *",
    "name" : "float *",
-   "referenced_type" : "type-25",
-   "self_type" : "type-24",
+   "referenced_type" : "type-60",
+   "self_type" : "type-59",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
@@ -2484,8 +2484,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-69",
-   "self_type" : "type-70",
+   "referenced_type" : "type-51",
+   "self_type" : "type-52",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2493,8 +2493,8 @@
    "alignment" : 8,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
+   "referenced_type" : "type-19",
+   "self_type" : "type-18",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/iosched_policy.h"
   },
@@ -2502,8 +2502,8 @@
    "alignment" : 8,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-27",
-   "self_type" : "type-35",
+   "referenced_type" : "type-21",
+   "self_type" : "type-25",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
@@ -2511,8 +2511,8 @@
    "alignment" : 8,
    "linker_set_key" : "str_parms *",
    "name" : "str_parms *",
-   "referenced_type" : "type-107",
-   "self_type" : "type-106",
+   "referenced_type" : "type-58",
+   "self_type" : "type-57",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
@@ -2520,8 +2520,8 @@
    "alignment" : 8,
    "linker_set_key" : "str_parms *",
    "name" : "str_parms *",
-   "referenced_type" : "type-23",
-   "self_type" : "type-22",
+   "referenced_type" : "type-83",
+   "self_type" : "type-82",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
@@ -2529,8 +2529,8 @@
    "alignment" : 8,
    "linker_set_key" : "str_parms *",
    "name" : "str_parms *",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
+   "referenced_type" : "type-94",
+   "self_type" : "type-93",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
@@ -2538,8 +2538,8 @@
    "alignment" : 8,
    "linker_set_key" : "thread_store_t *",
    "name" : "thread_store_t *",
-   "referenced_type" : "type-55",
-   "self_type" : "type-57",
+   "referenced_type" : "type-38",
+   "self_type" : "type-40",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   },
@@ -2548,7 +2548,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-6",
-   "self_type" : "type-26",
+   "self_type" : "type-20",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/misc.h"
   },
@@ -2556,8 +2556,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long *",
    "name" : "unsigned long *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-48",
+   "referenced_type" : "type-28",
+   "self_type" : "type-30",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2565,8 +2565,8 @@
    "alignment" : 8,
    "linker_set_key" : "void (*)(const char *, const char *, void *)",
    "name" : "void (*)(const char *, const char *, void *)",
-   "referenced_type" : "type-44",
-   "self_type" : "type-45",
+   "referenced_type" : "type-13",
+   "self_type" : "type-16",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
@@ -2574,8 +2574,8 @@
    "alignment" : 8,
    "linker_set_key" : "void (*)(void *)",
    "name" : "void (*)(void *)",
-   "referenced_type" : "type-58",
-   "self_type" : "type-59",
+   "referenced_type" : "type-41",
+   "self_type" : "type-42",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   },
@@ -2584,7 +2584,7 @@
    "linker_set_key" : "void *",
    "name" : "void *",
    "referenced_type" : "type-14",
-   "self_type" : "type-13",
+   "self_type" : "type-15",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/misc.h"
   },
@@ -2592,8 +2592,8 @@
    "alignment" : 8,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-13",
-   "self_type" : "type-47",
+   "referenced_type" : "type-15",
+   "self_type" : "type-29",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   }
@@ -2615,8 +2615,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-52",
-   "self_type" : "type-51",
+   "referenced_type" : "type-35",
+   "self_type" : "type-34",
    "size" : 2,
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
@@ -2625,8 +2625,8 @@
    "is_const" : true,
    "linker_set_key" : "const cutils_socket_buffer_t",
    "name" : "const cutils_socket_buffer_t",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
+   "referenced_type" : "type-31",
+   "self_type" : "type-55",
    "size" : 16,
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
@@ -2635,8 +2635,8 @@
    "is_const" : true,
    "linker_set_key" : "const iovec",
    "name" : "const iovec",
-   "referenced_type" : "type-41",
-   "self_type" : "type-40",
+   "referenced_type" : "type-99",
+   "self_type" : "type-98",
    "size" : 16,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2645,8 +2645,8 @@
    "is_const" : true,
    "linker_set_key" : "const iovec",
    "name" : "const iovec",
-   "referenced_type" : "type-76",
-   "self_type" : "type-75",
+   "referenced_type" : "type-9",
+   "self_type" : "type-8",
    "size" : 16,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2655,8 +2655,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-27",
-   "self_type" : "type-31",
+   "referenced_type" : "type-21",
+   "self_type" : "type-23",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
@@ -2665,7 +2665,7 @@
    "linker_set_key" : "const void",
    "name" : "const void",
    "referenced_type" : "type-14",
-   "self_type" : "type-19",
+   "self_type" : "type-33",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   }
  ],
@@ -2714,18 +2714,18 @@
    [
     {
      "field_name" : "data",
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "length",
      "field_offset" : 64,
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-28"
     }
    ],
    "linker_set_key" : "cutils_socket_buffer_t",
    "name" : "cutils_socket_buffer_t",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 16,
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h",
    "unique_id" : "cutils_socket_buffer_t"
@@ -2736,28 +2736,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-28"
+     "referenced_type" : "type-22"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -2768,23 +2768,23 @@
    [
     {
      "field_name" : "lock",
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-39"
     },
     {
      "field_name" : "has_tls",
      "field_offset" : 320,
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     },
     {
      "field_name" : "tls",
      "field_offset" : 352,
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-19"
     }
    ],
    "linker_set_key" : "thread_store_t",
    "name" : "thread_store_t",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 48,
    "source_file" : "/system/core/libcutils/include/cutils/threads.h",
    "unique_id" : "thread_store_t"
diff --git a/Q/64/arm64_armv8-a/source-based/libprocessgroup.so.lsdump b/Q/64/arm64_armv8-a/source-based/libprocessgroup.so.lsdump
index 658fe56..f00fe79 100644
--- a/Q/64/arm64_armv8-a/source-based/libprocessgroup.so.lsdump
+++ b/Q/64/arm64_armv8-a/source-based/libprocessgroup.so.lsdump
@@ -8,8 +8,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
+   "referenced_type" : "type-5",
+   "self_type" : "type-5",
    "size" : 1
   },
   {
@@ -27,20 +27,11 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 4
   },
   {
-   "alignment" : 8,
-   "is_integral" : true,
-   "linker_set_key" : "long",
-   "name" : "long",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
-   "size" : 8
-  },
-  {
    "alignment" : 4,
    "is_integral" : true,
    "is_unsigned" : true,
@@ -49,12 +40,6 @@
    "referenced_type" : "type-4",
    "self_type" : "type-4",
    "size" : 4
-  },
-  {
-   "linker_set_key" : "void",
-   "name" : "void",
-   "referenced_type" : "type-6",
-   "self_type" : "type-6"
   }
  ],
  "elf_functions" :
@@ -75,7 +60,31 @@
    "name" : "SetTaskProfiles"
   },
   {
-   "name" : "UsePerAppMemcg"
+   "name" : "_Z14UsePerAppMemcgv"
+  },
+  {
+   "name" : "_Z16killProcessGroupjii"
+  },
+  {
+   "name" : "_Z18createProcessGroupjib"
+  },
+  {
+   "name" : "_Z20killProcessGroupOncejii"
+  },
+  {
+   "name" : "_Z20setProcessGroupLimitjil"
+  },
+  {
+   "name" : "_Z22removeAllProcessGroupsv"
+  },
+  {
+   "name" : "_Z24setProcessGroupSoftLimitjil"
+  },
+  {
+   "name" : "_Z25setProcessGroupSwappinessjii"
+  },
+  {
+   "name" : "_ZN11TaskProfile21EnableResourceCachingEv"
   },
   {
    "name" : "_ZN12TaskProfiles11GetInstanceEv"
@@ -96,6 +105,9 @@
    "name" : "_ZN15SetCgroupAction18IsAppDependentPathERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
   },
   {
+   "name" : "_ZN15SetCgroupAction21EnableResourceCachingEv"
+  },
+  {
    "name" : "_ZN15SetCgroupActionC1ERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE"
   },
   {
@@ -587,36 +599,15 @@
    "name" : "cpusets_enabled"
   },
   {
-   "name" : "createProcessGroup"
-  },
-  {
    "name" : "get_sched_policy"
   },
   {
    "name" : "get_sched_policy_name"
   },
   {
-   "name" : "killProcessGroup"
-  },
-  {
-   "name" : "killProcessGroupOnce"
-  },
-  {
-   "name" : "removeAllProcessGroups"
-  },
-  {
    "name" : "schedboost_enabled"
   },
   {
-   "name" : "setProcessGroupLimit"
-  },
-  {
-   "name" : "setProcessGroupSoftLimit"
-  },
-  {
-   "name" : "setProcessGroupSwappiness"
-  },
-  {
    "name" : "set_cpuset_policy"
   },
   {
@@ -791,11 +782,11 @@
    ],
    "linker_set_key" : "SchedPolicy",
    "name" : "SchedPolicy",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
+   "referenced_type" : "type-11",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h",
-   "underlying_type" : "type-14",
+   "underlying_type" : "type-12",
    "unique_id" : "SchedPolicy"
   }
  ],
@@ -808,13 +799,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -823,16 +814,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -841,13 +832,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -859,13 +850,17 @@
      "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-17"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-5"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -874,59 +869,38 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-17"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-5"
     }
    ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "UsePerAppMemcg",
-   "linker_set_key" : "UsePerAppMemcg",
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
    "function_name" : "cpusets_enabled",
    "linker_set_key" : "cpusets_enabled",
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
-   "function_name" : "createProcessGroup",
-   "linker_set_key" : "createProcessGroup",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
    "function_name" : "get_sched_policy",
    "linker_set_key" : "get_sched_policy",
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
@@ -935,127 +909,31 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
    "return_type" : "type-1",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
-   "function_name" : "killProcessGroup",
-   "linker_set_key" : "killProcessGroup",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "killProcessGroupOnce",
-   "linker_set_key" : "killProcessGroupOnce",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "removeAllProcessGroups",
-   "linker_set_key" : "removeAllProcessGroups",
-   "return_type" : "type-6",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
    "function_name" : "schedboost_enabled",
    "linker_set_key" : "schedboost_enabled",
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
-   "function_name" : "setProcessGroupLimit",
-   "linker_set_key" : "setProcessGroupLimit",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-5"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "setProcessGroupSoftLimit",
-   "linker_set_key" : "setProcessGroupSoftLimit",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-5"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "setProcessGroupSwappiness",
-   "linker_set_key" : "setProcessGroupSwappiness",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
    "function_name" : "set_cpuset_policy",
    "linker_set_key" : "set_cpuset_policy",
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
@@ -1064,13 +942,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   }
  ],
@@ -1081,8 +959,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-8",
-   "self_type" : "type-10",
+   "referenced_type" : "type-6",
+   "self_type" : "type-8",
    "size" : 8,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
@@ -1090,8 +968,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
    "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
-   "referenced_type" : "type-17",
-   "self_type" : "type-19",
+   "referenced_type" : "type-15",
+   "self_type" : "type-17",
    "size" : 8,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   }
@@ -1102,8 +980,8 @@
    "alignment" : 8,
    "linker_set_key" : "SchedPolicy *",
    "name" : "SchedPolicy *",
-   "referenced_type" : "type-13",
-   "self_type" : "type-15",
+   "referenced_type" : "type-11",
+   "self_type" : "type-13",
    "size" : 8,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
@@ -1120,8 +998,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
+   "referenced_type" : "type-10",
+   "self_type" : "type-9",
    "size" : 8,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   }
@@ -1144,7 +1022,7 @@
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
    "referenced_type" : "type-1",
-   "self_type" : "type-16",
+   "self_type" : "type-14",
    "size" : 8,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
@@ -1153,8 +1031,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-9",
-   "self_type" : "type-8",
+   "referenced_type" : "type-7",
+   "self_type" : "type-6",
    "size" : 24,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
@@ -1163,8 +1041,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
    "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
-   "referenced_type" : "type-18",
-   "self_type" : "type-17",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 24,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   }
diff --git a/Q/64/arm_armv7-a-neon/source-based/libcutils.so.lsdump b/Q/64/arm_armv7-a-neon/source-based/libcutils.so.lsdump
index 09f26e5..3a766b9 100644
--- a/Q/64/arm_armv7-a-neon/source-based/libcutils.so.lsdump
+++ b/Q/64/arm_armv7-a-neon/source-based/libcutils.so.lsdump
@@ -5,8 +5,8 @@
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-18",
-   "self_type" : "type-21",
+   "referenced_type" : "type-10",
+   "self_type" : "type-15",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   }
  ],
@@ -18,8 +18,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-15",
-   "self_type" : "type-15",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
    "size" : 1
   },
   {
@@ -38,24 +38,24 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 2
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-90",
-   "self_type" : "type-90",
+   "referenced_type" : "type-127",
+   "self_type" : "type-127",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
    "size" : 4
   },
   {
@@ -63,8 +63,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-18",
-   "self_type" : "type-18",
+   "referenced_type" : "type-10",
+   "self_type" : "type-10",
    "size" : 4
   },
   {
@@ -72,16 +72,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
+   "referenced_type" : "type-132",
+   "self_type" : "type-132",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
+   "referenced_type" : "type-131",
+   "self_type" : "type-131",
    "size" : 8
   },
   {
@@ -89,8 +89,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-8",
-   "self_type" : "type-8",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
    "size" : 8
   },
   {
@@ -98,8 +98,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
+   "referenced_type" : "type-130",
+   "self_type" : "type-130",
    "size" : 2
   },
   {
@@ -107,8 +107,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 1
   },
   {
@@ -117,8 +117,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-91",
-   "self_type" : "type-91",
+   "referenced_type" : "type-128",
+   "self_type" : "type-128",
    "size" : 1
   },
   {
@@ -137,8 +137,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-92",
-   "self_type" : "type-92",
+   "referenced_type" : "type-129",
+   "self_type" : "type-129",
    "size" : 4
   },
   {
@@ -147,8 +147,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
+   "referenced_type" : "type-85",
+   "self_type" : "type-85",
    "size" : 8
   },
   {
@@ -157,8 +157,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
+   "referenced_type" : "type-34",
+   "self_type" : "type-34",
    "size" : 2
   },
   {
@@ -592,8 +592,8 @@
    ],
    "linker_set_key" : "IoSchedClass",
    "name" : "IoSchedClass",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
+   "referenced_type" : "type-8",
+   "self_type" : "type-8",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/iosched_policy.h",
    "underlying_type" : "type-6",
@@ -609,15 +609,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "referenced_type" : "type-44",
-   "return_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "type-38",
+   "return_type" : "type-39",
+   "self_type" : "type-38",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -627,18 +627,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "referenced_type" : "type-46",
-   "return_type" : "type-47",
-   "self_type" : "type-46",
+   "referenced_type" : "type-40",
+   "return_type" : "type-41",
+   "self_type" : "type-40",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -648,12 +648,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "referenced_type" : "type-49",
-   "return_type" : "type-18",
-   "self_type" : "type-49",
+   "referenced_type" : "type-43",
+   "return_type" : "type-10",
+   "self_type" : "type-43",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -669,12 +669,12 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "referenced_type" : "type-11",
+   "referenced_type" : "type-80",
    "return_type" : "type-12",
-   "self_type" : "type-11",
+   "self_type" : "type-80",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -684,12 +684,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "referenced_type" : "type-38",
+   "referenced_type" : "type-32",
    "return_type" : "type-12",
-   "self_type" : "type-38",
+   "self_type" : "type-32",
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   }
  ],
@@ -704,7 +704,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/android_get_control_file.h"
   },
   {
@@ -716,7 +716,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -725,16 +725,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
+    },
+    {
+     "referenced_type" : "type-7"
     },
     {
      "referenced_type" : "type-9"
-    },
-    {
-     "referenced_type" : "type-17"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/iosched_policy.h"
   },
   {
@@ -746,13 +746,13 @@
      "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/android_reboot.h"
   },
   {
@@ -761,16 +761,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
-    },
-    {
      "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/iosched_policy.h"
   },
   {
@@ -785,7 +785,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -794,10 +794,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -812,7 +812,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
      "referenced_type" : "type-6"
@@ -821,7 +821,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -830,13 +830,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -845,7 +845,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
      "referenced_type" : "type-6"
@@ -854,7 +854,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -863,10 +863,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -878,7 +878,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
    "return_type" : "type-12",
@@ -893,7 +893,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
    "return_type" : "type-12",
@@ -926,7 +926,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-8"
+     "referenced_type" : "type-78"
     }
    ],
    "return_type" : "type-12",
@@ -941,7 +941,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
    "return_type" : "type-12",
@@ -953,7 +953,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-84"
     }
    ],
    "return_type" : "type-12",
@@ -965,7 +965,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-84"
     }
    ],
    "return_type" : "type-12",
@@ -995,10 +995,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/config_utils.h"
   },
   {
@@ -1037,7 +1037,7 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-45"
     }
    ],
    "return_type" : "type-12",
@@ -1118,10 +1118,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-34"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1133,7 +1133,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-34"
     },
     {
      "referenced_type" : "type-6"
@@ -1142,7 +1142,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1154,7 +1154,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-34"
     },
     {
      "referenced_type" : "type-6"
@@ -1163,7 +1163,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1175,7 +1175,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-34"
     },
     {
      "referenced_type" : "type-6"
@@ -1184,7 +1184,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1196,10 +1196,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1211,10 +1211,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1226,13 +1226,13 @@
      "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-35",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1241,13 +1241,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-35"
     },
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-42"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
    "return_type" : "type-12",
@@ -1259,7 +1259,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-35"
     }
    ],
    "return_type" : "type-12",
@@ -1271,13 +1271,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-35"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "type-11",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1286,13 +1286,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     },
     {
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1301,7 +1301,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-35"
     }
    ],
    "return_type" : "type-12",
@@ -1313,16 +1313,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-35"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "type-11",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1331,13 +1331,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-35"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "type-11",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1346,7 +1346,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-35"
     }
    ],
    "return_type" : "type-12",
@@ -1358,7 +1358,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
    "return_type" : "type-12",
@@ -1370,7 +1370,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
      "referenced_type" : "type-3"
@@ -1385,13 +1385,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-115"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
    "return_type" : "type-12",
@@ -1406,10 +1406,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "type-11",
    "source_file" : "/system/core/libcutils/include/cutils/misc.h"
   },
   {
@@ -1529,10 +1529,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-17"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-18",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1541,10 +1541,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-17"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1553,13 +1553,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-18",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1568,10 +1568,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-18"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1580,16 +1580,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-18",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1601,7 +1601,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/partition_utils.h"
   },
   {
@@ -1613,13 +1613,13 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-45"
     },
     {
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1631,10 +1631,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-77"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-77",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1646,10 +1646,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1661,10 +1661,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-8"
+     "referenced_type" : "type-78"
     }
    ],
-   "return_type" : "type-8",
+   "return_type" : "type-78",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1673,13 +1673,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-83"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1694,7 +1694,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1703,7 +1703,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-19"
     }
    ],
    "return_type" : "type-12",
@@ -1715,16 +1715,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-25"
-    },
-    {
-     "referenced_type" : "type-27"
-    },
-    {
      "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-21"
+    },
+    {
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
   {
@@ -1733,13 +1733,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-25",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
   {
@@ -1748,10 +1748,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1760,10 +1760,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1772,13 +1772,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1790,13 +1790,13 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1805,19 +1805,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1829,13 +1829,13 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1844,16 +1844,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1865,13 +1865,13 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1883,19 +1883,19 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1904,16 +1904,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-72"
     },
     {
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1922,13 +1922,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1937,16 +1937,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-73"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-57"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1955,16 +1955,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-73"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1973,7 +1973,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-73"
     },
     {
      "referenced_type" : "type-3"
@@ -1982,13 +1982,13 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
    "function_name" : "str_parms_create",
    "linker_set_key" : "str_parms_create",
-   "return_type" : "type-54",
+   "return_type" : "type-73",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2000,7 +2000,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-54",
+   "return_type" : "type-73",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2009,7 +2009,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-73"
     },
     {
      "referenced_type" : "type-3"
@@ -2024,7 +2024,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-73"
     }
    ],
    "return_type" : "type-12",
@@ -2036,7 +2036,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-73"
     }
    ],
    "return_type" : "type-12",
@@ -2048,16 +2048,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-73"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-75"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2066,16 +2066,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-73"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2084,19 +2084,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-73"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2105,13 +2105,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-73"
     },
     {
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2120,10 +2120,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-51",
+   "return_type" : "type-45",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2132,16 +2132,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-28"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-34",
+   "return_type" : "type-28",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2150,19 +2150,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-28"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-34",
+   "return_type" : "type-28",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2174,10 +2174,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-34",
+   "return_type" : "type-28",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2198,16 +2198,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-27"
     },
     {
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-51",
+   "return_type" : "type-45",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2216,13 +2216,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-27"
     },
     {
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-51",
+   "return_type" : "type-45",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2231,7 +2231,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-27"
     },
     {
      "referenced_type" : "type-6"
@@ -2246,10 +2246,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-37"
+     "referenced_type" : "type-31"
     }
    ],
-   "return_type" : "type-13",
+   "return_type" : "type-11",
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   },
   {
@@ -2258,13 +2258,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-37"
+     "referenced_type" : "type-31"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-33"
     }
    ],
    "return_type" : "type-12",
@@ -2276,16 +2276,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     },
     {
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/uevent.h"
   },
   {
@@ -2294,19 +2294,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     },
     {
      "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/uevent.h"
   },
   {
@@ -2315,22 +2315,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     },
     {
      "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-84"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/uevent.h"
   },
   {
@@ -2339,13 +2339,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-84"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/uevent.h"
   }
  ],
@@ -2354,19 +2354,19 @@
   {
    "linker_set_key" : "atrace_enabled_tags",
    "name" : "atrace_enabled_tags",
-   "referenced_type" : "type-16",
+   "referenced_type" : "type-85",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
    "linker_set_key" : "atrace_is_ready",
    "name" : "atrace_is_ready",
-   "referenced_type" : "type-61",
+   "referenced_type" : "type-116",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
    "linker_set_key" : "atrace_marker_fd",
    "name" : "atrace_marker_fd",
-   "referenced_type" : "type-18",
+   "referenced_type" : "type-10",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   }
  ],
@@ -2377,8 +2377,8 @@
    "alignment" : 4,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-108",
-   "self_type" : "type-107",
+   "referenced_type" : "type-103",
+   "self_type" : "type-102",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2386,8 +2386,8 @@
    "alignment" : 4,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-42",
-   "self_type" : "type-41",
+   "referenced_type" : "type-153",
+   "self_type" : "type-152",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2395,8 +2395,8 @@
    "alignment" : 4,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-64",
-   "self_type" : "type-63",
+   "referenced_type" : "type-36",
+   "self_type" : "type-35",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2404,8 +2404,8 @@
    "alignment" : 4,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-76",
+   "referenced_type" : "type-66",
+   "self_type" : "type-65",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2413,8 +2413,8 @@
    "alignment" : 4,
    "linker_set_key" : "IoSchedClass *",
    "name" : "IoSchedClass *",
-   "referenced_type" : "type-10",
-   "self_type" : "type-9",
+   "referenced_type" : "type-8",
+   "self_type" : "type-7",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/iosched_policy.h"
   },
@@ -2422,8 +2422,8 @@
    "alignment" : 4,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-100",
-   "self_type" : "type-99",
+   "referenced_type" : "type-140",
+   "self_type" : "type-139",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2431,8 +2431,8 @@
    "alignment" : 4,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-113",
-   "self_type" : "type-112",
+   "referenced_type" : "type-145",
+   "self_type" : "type-144",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2440,8 +2440,8 @@
    "alignment" : 4,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-26",
-   "self_type" : "type-25",
+   "referenced_type" : "type-20",
+   "self_type" : "type-19",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2449,8 +2449,8 @@
    "alignment" : 4,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-74",
-   "self_type" : "type-73",
+   "referenced_type" : "type-56",
+   "self_type" : "type-55",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2458,8 +2458,8 @@
    "alignment" : 4,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-85",
-   "self_type" : "type-84",
+   "referenced_type" : "type-94",
+   "self_type" : "type-93",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2467,8 +2467,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(void *, void *)",
    "name" : "bool (*)(void *, void *)",
-   "referenced_type" : "type-44",
-   "self_type" : "type-43",
+   "referenced_type" : "type-38",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2476,8 +2476,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(void *, void *, void *)",
    "name" : "bool (*)(void *, void *, void *)",
-   "referenced_type" : "type-46",
-   "self_type" : "type-48",
+   "referenced_type" : "type-40",
+   "self_type" : "type-42",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2486,7 +2486,7 @@
    "linker_set_key" : "char *",
    "name" : "char *",
    "referenced_type" : "type-5",
-   "self_type" : "type-51",
+   "self_type" : "type-45",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/config_utils.h"
   },
@@ -2494,8 +2494,8 @@
    "alignment" : 4,
    "linker_set_key" : "char16_t *",
    "name" : "char16_t *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-34",
+   "referenced_type" : "type-26",
+   "self_type" : "type-28",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
@@ -2521,8 +2521,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-31",
-   "self_type" : "type-33",
+   "referenced_type" : "type-25",
+   "self_type" : "type-27",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
@@ -2530,8 +2530,8 @@
    "alignment" : 4,
    "linker_set_key" : "const cutils_socket_buffer_t *",
    "name" : "const cutils_socket_buffer_t *",
-   "referenced_type" : "type-52",
-   "self_type" : "type-53",
+   "referenced_type" : "type-71",
+   "self_type" : "type-72",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
@@ -2539,8 +2539,8 @@
    "alignment" : 4,
    "linker_set_key" : "const iovec *",
    "name" : "const iovec *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-60",
+   "referenced_type" : "type-113",
+   "self_type" : "type-115",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2548,8 +2548,8 @@
    "alignment" : 4,
    "linker_set_key" : "const iovec *",
    "name" : "const iovec *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-88",
+   "referenced_type" : "type-121",
+   "self_type" : "type-124",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2557,8 +2557,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-23",
+   "referenced_type" : "type-16",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
@@ -2566,8 +2566,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-30",
-   "self_type" : "type-29",
+   "referenced_type" : "type-24",
+   "self_type" : "type-23",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
@@ -2575,8 +2575,8 @@
    "alignment" : 4,
    "linker_set_key" : "float *",
    "name" : "float *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-76",
+   "self_type" : "type-75",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
@@ -2584,8 +2584,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-49",
-   "self_type" : "type-50",
+   "referenced_type" : "type-43",
+   "self_type" : "type-44",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2593,8 +2593,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-18",
-   "self_type" : "type-17",
+   "referenced_type" : "type-10",
+   "self_type" : "type-9",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/iosched_policy.h"
   },
@@ -2602,8 +2602,8 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-24",
+   "referenced_type" : "type-14",
+   "self_type" : "type-18",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
@@ -2611,8 +2611,8 @@
    "alignment" : 4,
    "linker_set_key" : "str_parms *",
    "name" : "str_parms *",
-   "referenced_type" : "type-55",
-   "self_type" : "type-54",
+   "referenced_type" : "type-111",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
@@ -2620,8 +2620,8 @@
    "alignment" : 4,
    "linker_set_key" : "str_parms *",
    "name" : "str_parms *",
-   "referenced_type" : "type-70",
-   "self_type" : "type-69",
+   "referenced_type" : "type-118",
+   "self_type" : "type-117",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
@@ -2629,8 +2629,8 @@
    "alignment" : 4,
    "linker_set_key" : "str_parms *",
    "name" : "str_parms *",
-   "referenced_type" : "type-83",
-   "self_type" : "type-82",
+   "referenced_type" : "type-74",
+   "self_type" : "type-73",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
@@ -2638,8 +2638,8 @@
    "alignment" : 4,
    "linker_set_key" : "thread_store_t *",
    "name" : "thread_store_t *",
-   "referenced_type" : "type-35",
-   "self_type" : "type-37",
+   "referenced_type" : "type-29",
+   "self_type" : "type-31",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   },
@@ -2648,7 +2648,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-6",
-   "self_type" : "type-19",
+   "self_type" : "type-13",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/misc.h"
   },
@@ -2656,8 +2656,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(const char *, const char *, void *)",
    "name" : "void (*)(const char *, const char *, void *)",
-   "referenced_type" : "type-11",
-   "self_type" : "type-14",
+   "referenced_type" : "type-80",
+   "self_type" : "type-83",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
@@ -2665,8 +2665,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(void *)",
    "name" : "void (*)(void *)",
-   "referenced_type" : "type-38",
-   "self_type" : "type-39",
+   "referenced_type" : "type-32",
+   "self_type" : "type-33",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   },
@@ -2675,7 +2675,7 @@
    "linker_set_key" : "void *",
    "name" : "void *",
    "referenced_type" : "type-12",
-   "self_type" : "type-13",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/misc.h"
   },
@@ -2683,8 +2683,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-13",
-   "self_type" : "type-27",
+   "referenced_type" : "type-11",
+   "self_type" : "type-21",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   }
@@ -2706,8 +2706,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-32",
-   "self_type" : "type-31",
+   "referenced_type" : "type-26",
+   "self_type" : "type-25",
    "size" : 2,
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
@@ -2716,8 +2716,8 @@
    "is_const" : true,
    "linker_set_key" : "const cutils_socket_buffer_t",
    "name" : "const cutils_socket_buffer_t",
-   "referenced_type" : "type-28",
-   "self_type" : "type-52",
+   "referenced_type" : "type-22",
+   "self_type" : "type-71",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
@@ -2726,8 +2726,8 @@
    "is_const" : true,
    "linker_set_key" : "const iovec",
    "name" : "const iovec",
-   "referenced_type" : "type-59",
-   "self_type" : "type-58",
+   "referenced_type" : "type-114",
+   "self_type" : "type-113",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2736,8 +2736,8 @@
    "is_const" : true,
    "linker_set_key" : "const iovec",
    "name" : "const iovec",
-   "referenced_type" : "type-87",
-   "self_type" : "type-86",
+   "referenced_type" : "type-122",
+   "self_type" : "type-121",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2746,8 +2746,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-20",
-   "self_type" : "type-22",
+   "referenced_type" : "type-14",
+   "self_type" : "type-16",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
@@ -2756,7 +2756,7 @@
    "linker_set_key" : "const void",
    "name" : "const void",
    "referenced_type" : "type-12",
-   "self_type" : "type-30",
+   "self_type" : "type-24",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   }
  ],
@@ -2805,7 +2805,7 @@
    [
     {
      "field_name" : "data",
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "length",
@@ -2815,8 +2815,8 @@
    ],
    "linker_set_key" : "cutils_socket_buffer_t",
    "name" : "cutils_socket_buffer_t",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h",
    "unique_id" : "cutils_socket_buffer_t"
@@ -2827,28 +2827,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-15"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -2859,23 +2859,23 @@
    [
     {
      "field_name" : "lock",
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-30"
     },
     {
      "field_name" : "has_tls",
      "field_offset" : 32,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     },
     {
      "field_name" : "tls",
      "field_offset" : 64,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-10"
     }
    ],
    "linker_set_key" : "thread_store_t",
    "name" : "thread_store_t",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/threads.h",
    "unique_id" : "thread_store_t"
diff --git a/Q/64/arm_armv7-a-neon/source-based/libprocessgroup.so.lsdump b/Q/64/arm_armv7-a-neon/source-based/libprocessgroup.so.lsdump
index d440dc4..c7f813e 100644
--- a/Q/64/arm_armv7-a-neon/source-based/libprocessgroup.so.lsdump
+++ b/Q/64/arm_armv7-a-neon/source-based/libprocessgroup.so.lsdump
@@ -8,8 +8,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
+   "referenced_type" : "type-5",
+   "self_type" : "type-5",
    "size" : 1
   },
   {
@@ -26,8 +26,8 @@
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 8
   },
   {
@@ -35,8 +35,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 4
   },
   {
@@ -61,8 +61,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 8
   },
   {
@@ -80,8 +80,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
    "size" : 1
   },
   {
@@ -120,15 +120,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-18",
-   "self_type" : "type-18",
+   "referenced_type" : "type-17",
+   "self_type" : "type-17",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-6",
-   "self_type" : "type-6"
+   "referenced_type" : "type-15",
+   "self_type" : "type-15"
   }
  ],
  "elf_functions" :
@@ -149,7 +149,31 @@
    "name" : "SetTaskProfiles"
   },
   {
-   "name" : "UsePerAppMemcg"
+   "name" : "_Z14UsePerAppMemcgv"
+  },
+  {
+   "name" : "_Z16killProcessGroupjii"
+  },
+  {
+   "name" : "_Z18createProcessGroupjib"
+  },
+  {
+   "name" : "_Z20killProcessGroupOncejii"
+  },
+  {
+   "name" : "_Z20setProcessGroupLimitjix"
+  },
+  {
+   "name" : "_Z22removeAllProcessGroupsv"
+  },
+  {
+   "name" : "_Z24setProcessGroupSoftLimitjix"
+  },
+  {
+   "name" : "_Z25setProcessGroupSwappinessjii"
+  },
+  {
+   "name" : "_ZN11TaskProfile21EnableResourceCachingEv"
   },
   {
    "name" : "_ZN12TaskProfiles11GetInstanceEv"
@@ -170,6 +194,9 @@
    "name" : "_ZN15SetCgroupAction18IsAppDependentPathERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
   },
   {
+   "name" : "_ZN15SetCgroupAction21EnableResourceCachingEv"
+  },
+  {
    "name" : "_ZN15SetCgroupActionC1ERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE"
   },
   {
@@ -733,36 +760,15 @@
    "name" : "cpusets_enabled"
   },
   {
-   "name" : "createProcessGroup"
-  },
-  {
    "name" : "get_sched_policy"
   },
   {
    "name" : "get_sched_policy_name"
   },
   {
-   "name" : "killProcessGroup"
-  },
-  {
-   "name" : "killProcessGroupOnce"
-  },
-  {
-   "name" : "removeAllProcessGroups"
-  },
-  {
    "name" : "schedboost_enabled"
   },
   {
-   "name" : "setProcessGroupLimit"
-  },
-  {
-   "name" : "setProcessGroupSoftLimit"
-  },
-  {
-   "name" : "setProcessGroupSwappiness"
-  },
-  {
    "name" : "set_cpuset_policy"
   },
   {
@@ -937,11 +943,11 @@
    ],
    "linker_set_key" : "SchedPolicy",
    "name" : "SchedPolicy",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
+   "referenced_type" : "type-11",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h",
-   "underlying_type" : "type-14",
+   "underlying_type" : "type-12",
    "unique_id" : "SchedPolicy"
   }
  ],
@@ -954,13 +960,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -969,16 +975,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -987,13 +993,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -1005,13 +1011,17 @@
      "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
      "referenced_type" : "type-35"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-5"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -1020,59 +1030,38 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
      "referenced_type" : "type-35"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-5"
     }
    ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "UsePerAppMemcg",
-   "linker_set_key" : "UsePerAppMemcg",
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
    "function_name" : "cpusets_enabled",
    "linker_set_key" : "cpusets_enabled",
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
-   "function_name" : "createProcessGroup",
-   "linker_set_key" : "createProcessGroup",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
    "function_name" : "get_sched_policy",
    "linker_set_key" : "get_sched_policy",
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
@@ -1081,127 +1070,31 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
    "return_type" : "type-1",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
-   "function_name" : "killProcessGroup",
-   "linker_set_key" : "killProcessGroup",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "killProcessGroupOnce",
-   "linker_set_key" : "killProcessGroupOnce",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "removeAllProcessGroups",
-   "linker_set_key" : "removeAllProcessGroups",
-   "return_type" : "type-6",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
    "function_name" : "schedboost_enabled",
    "linker_set_key" : "schedboost_enabled",
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
-   "function_name" : "setProcessGroupLimit",
-   "linker_set_key" : "setProcessGroupLimit",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-5"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "setProcessGroupSoftLimit",
-   "linker_set_key" : "setProcessGroupSoftLimit",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-5"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "setProcessGroupSwappiness",
-   "linker_set_key" : "setProcessGroupSwappiness",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
    "function_name" : "set_cpuset_policy",
    "linker_set_key" : "set_cpuset_policy",
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
@@ -1210,13 +1103,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   }
  ],
@@ -1236,8 +1129,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-8",
-   "self_type" : "type-10",
+   "referenced_type" : "type-6",
+   "self_type" : "type-8",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
@@ -1266,8 +1159,8 @@
    "alignment" : 4,
    "linker_set_key" : "SchedPolicy *",
    "name" : "SchedPolicy *",
-   "referenced_type" : "type-13",
-   "self_type" : "type-15",
+   "referenced_type" : "type-11",
+   "self_type" : "type-13",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
@@ -1284,8 +1177,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
+   "referenced_type" : "type-10",
+   "self_type" : "type-9",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
@@ -1336,8 +1229,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-9",
-   "self_type" : "type-8",
+   "referenced_type" : "type-7",
+   "self_type" : "type-6",
    "size" : 12,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
diff --git a/Q/64/arm_armv8-a/source-based/libcutils.so.lsdump b/Q/64/arm_armv8-a/source-based/libcutils.so.lsdump
index 09f26e5..2b1654f 100644
--- a/Q/64/arm_armv8-a/source-based/libcutils.so.lsdump
+++ b/Q/64/arm_armv8-a/source-based/libcutils.so.lsdump
@@ -5,8 +5,8 @@
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-18",
-   "self_type" : "type-21",
+   "referenced_type" : "type-12",
+   "self_type" : "type-28",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   }
  ],
@@ -18,8 +18,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-15",
-   "self_type" : "type-15",
+   "referenced_type" : "type-45",
+   "self_type" : "type-45",
    "size" : 1
   },
   {
@@ -38,24 +38,24 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-66",
+   "self_type" : "type-66",
    "size" : 2
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-90",
-   "self_type" : "type-90",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 4
   },
   {
@@ -63,8 +63,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-18",
-   "self_type" : "type-18",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 4
   },
   {
@@ -72,16 +72,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 8
   },
   {
@@ -89,8 +89,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-8",
-   "self_type" : "type-8",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
    "size" : 8
   },
   {
@@ -98,8 +98,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 2
   },
   {
@@ -107,8 +107,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
+   "referenced_type" : "type-41",
+   "self_type" : "type-41",
    "size" : 1
   },
   {
@@ -117,8 +117,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-91",
-   "self_type" : "type-91",
+   "referenced_type" : "type-58",
+   "self_type" : "type-58",
    "size" : 1
   },
   {
@@ -137,8 +137,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-92",
-   "self_type" : "type-92",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 4
   },
   {
@@ -147,8 +147,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
+   "referenced_type" : "type-46",
+   "self_type" : "type-46",
    "size" : 8
   },
   {
@@ -157,15 +157,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12"
+   "referenced_type" : "type-14",
+   "self_type" : "type-14"
   }
  ],
  "elf_functions" :
@@ -592,8 +592,8 @@
    ],
    "linker_set_key" : "IoSchedClass",
    "name" : "IoSchedClass",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
+   "referenced_type" : "type-8",
+   "self_type" : "type-8",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/iosched_policy.h",
    "underlying_type" : "type-6",
@@ -615,9 +615,9 @@
      "referenced_type" : "type-13"
     }
    ],
-   "referenced_type" : "type-44",
-   "return_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "type-79",
+   "return_type" : "type-80",
+   "self_type" : "type-79",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -636,9 +636,9 @@
      "referenced_type" : "type-13"
     }
    ],
-   "referenced_type" : "type-46",
-   "return_type" : "type-47",
-   "self_type" : "type-46",
+   "referenced_type" : "type-81",
+   "return_type" : "type-82",
+   "self_type" : "type-81",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -651,9 +651,9 @@
      "referenced_type" : "type-13"
     }
    ],
-   "referenced_type" : "type-49",
-   "return_type" : "type-18",
-   "self_type" : "type-49",
+   "referenced_type" : "type-84",
+   "return_type" : "type-12",
+   "self_type" : "type-84",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -672,9 +672,9 @@
      "referenced_type" : "type-13"
     }
    ],
-   "referenced_type" : "type-11",
-   "return_type" : "type-12",
-   "self_type" : "type-11",
+   "referenced_type" : "type-43",
+   "return_type" : "type-14",
+   "self_type" : "type-43",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -687,9 +687,9 @@
      "referenced_type" : "type-13"
     }
    ],
-   "referenced_type" : "type-38",
-   "return_type" : "type-12",
-   "self_type" : "type-38",
+   "referenced_type" : "type-72",
+   "return_type" : "type-14",
+   "self_type" : "type-72",
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   }
  ],
@@ -704,7 +704,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/android_get_control_file.h"
   },
   {
@@ -716,7 +716,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -725,16 +725,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-9"
+     "referenced_type" : "type-7"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/iosched_policy.h"
   },
   {
@@ -746,13 +746,13 @@
      "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/android_reboot.h"
   },
   {
@@ -761,16 +761,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/iosched_policy.h"
   },
   {
@@ -785,7 +785,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -794,16 +794,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
    "function_name" : "ashmem_init",
    "linker_set_key" : "ashmem_init",
-   "return_type" : "type-12",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -812,7 +812,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
      "referenced_type" : "type-6"
@@ -821,7 +821,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -830,13 +830,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -845,7 +845,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
      "referenced_type" : "type-6"
@@ -854,7 +854,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -863,10 +863,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -878,10 +878,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
@@ -893,10 +893,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
@@ -908,13 +908,13 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
    "function_name" : "atrace_end_body",
    "linker_set_key" : "atrace_end_body",
-   "return_type" : "type-12",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
@@ -926,10 +926,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-8"
+     "referenced_type" : "type-42"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
@@ -941,10 +941,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
@@ -953,10 +953,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
@@ -965,22 +965,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
    "function_name" : "atrace_setup",
    "linker_set_key" : "atrace_setup",
-   "return_type" : "type-12",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
    "function_name" : "atrace_update_tags",
    "linker_set_key" : "atrace_update_tags",
-   "return_type" : "type-12",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
@@ -995,10 +995,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/config_utils.h"
   },
   {
@@ -1025,7 +1025,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/config_utils.h"
   },
   {
@@ -1037,10 +1037,10 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-75"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/config_utils.h"
   },
   {
@@ -1055,7 +1055,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/config_utils.h"
   },
   {
@@ -1088,7 +1088,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/config_utils.h"
   },
   {
@@ -1118,10 +1118,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-74"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1133,7 +1133,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-74"
     },
     {
      "referenced_type" : "type-6"
@@ -1142,7 +1142,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1154,7 +1154,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-74"
     },
     {
      "referenced_type" : "type-6"
@@ -1163,7 +1163,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1175,7 +1175,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-74"
     },
     {
      "referenced_type" : "type-6"
@@ -1184,7 +1184,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1196,10 +1196,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1211,10 +1211,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1226,13 +1226,13 @@
      "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-85"
     },
     {
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-78"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-76",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1241,16 +1241,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-76"
     },
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-83"
     },
     {
      "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1259,10 +1259,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1271,7 +1271,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-76"
     },
     {
      "referenced_type" : "type-13"
@@ -1292,7 +1292,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1301,10 +1301,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1313,7 +1313,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-76"
     },
     {
      "referenced_type" : "type-13"
@@ -1331,7 +1331,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-76"
     },
     {
      "referenced_type" : "type-13"
@@ -1346,10 +1346,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-76"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1358,10 +1358,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
   {
@@ -1370,13 +1370,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
   {
@@ -1385,16 +1385,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-40"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
   {
@@ -1406,7 +1406,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-24"
     }
    ],
    "return_type" : "type-13",
@@ -1529,10 +1529,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-33",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1541,10 +1541,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1553,13 +1553,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-33",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1568,10 +1568,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-33"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1580,16 +1580,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-75"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-24",
+   "return_type" : "type-33",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1601,7 +1601,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/partition_utils.h"
   },
   {
@@ -1613,13 +1613,13 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-75"
     },
     {
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1631,10 +1631,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-41",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1646,10 +1646,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1661,10 +1661,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-8"
+     "referenced_type" : "type-42"
     }
    ],
-   "return_type" : "type-8",
+   "return_type" : "type-42",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1673,13 +1673,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-44"
     },
     {
      "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1694,7 +1694,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1703,10 +1703,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-36"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
   {
@@ -1715,16 +1715,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-36"
     },
     {
-     "referenced_type" : "type-27"
+     "referenced_type" : "type-47"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-24"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
   {
@@ -1733,13 +1733,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-25",
+   "return_type" : "type-36",
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
   {
@@ -1748,10 +1748,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1760,10 +1760,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1772,13 +1772,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1790,13 +1790,13 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1805,19 +1805,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1829,13 +1829,13 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1844,16 +1844,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1865,13 +1865,13 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1883,19 +1883,19 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1904,16 +1904,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-19"
     },
     {
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1922,13 +1922,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1937,16 +1937,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-20"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-57"
+     "referenced_type" : "type-23"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1955,16 +1955,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-20"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1973,7 +1973,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-20"
     },
     {
      "referenced_type" : "type-3"
@@ -1982,13 +1982,13 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
    "function_name" : "str_parms_create",
    "linker_set_key" : "str_parms_create",
-   "return_type" : "type-54",
+   "return_type" : "type-20",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2000,7 +2000,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-54",
+   "return_type" : "type-20",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2009,13 +2009,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-20"
     },
     {
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2024,10 +2024,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-20"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2036,10 +2036,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-20"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2048,16 +2048,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-20"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-22"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2066,16 +2066,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-20"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2084,19 +2084,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-20"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-75"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2105,13 +2105,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-20"
     },
     {
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2120,10 +2120,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-20"
     }
    ],
-   "return_type" : "type-51",
+   "return_type" : "type-75",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2132,16 +2132,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-68"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-24"
     }
    ],
-   "return_type" : "type-34",
+   "return_type" : "type-68",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2150,19 +2150,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-68"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-24"
     }
    ],
-   "return_type" : "type-34",
+   "return_type" : "type-68",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2174,10 +2174,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-24"
     }
    ],
-   "return_type" : "type-34",
+   "return_type" : "type-68",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2198,16 +2198,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-75"
     },
     {
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-67"
     },
     {
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-51",
+   "return_type" : "type-75",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2216,13 +2216,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-67"
     },
     {
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-51",
+   "return_type" : "type-75",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2231,7 +2231,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-67"
     },
     {
      "referenced_type" : "type-6"
@@ -2246,7 +2246,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-37"
+     "referenced_type" : "type-71"
     }
    ],
    "return_type" : "type-13",
@@ -2258,16 +2258,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-37"
+     "referenced_type" : "type-71"
     },
     {
      "referenced_type" : "type-13"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-73"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   },
   {
@@ -2276,7 +2276,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
      "referenced_type" : "type-13"
@@ -2285,7 +2285,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/uevent.h"
   },
   {
@@ -2294,7 +2294,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
      "referenced_type" : "type-13"
@@ -2303,10 +2303,10 @@
      "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-24"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/uevent.h"
   },
   {
@@ -2315,7 +2315,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
      "referenced_type" : "type-13"
@@ -2324,13 +2324,13 @@
      "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-24"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/uevent.h"
   },
   {
@@ -2339,13 +2339,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/uevent.h"
   }
  ],
@@ -2354,19 +2354,19 @@
   {
    "linker_set_key" : "atrace_enabled_tags",
    "name" : "atrace_enabled_tags",
-   "referenced_type" : "type-16",
+   "referenced_type" : "type-46",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
    "linker_set_key" : "atrace_is_ready",
    "name" : "atrace_is_ready",
-   "referenced_type" : "type-61",
+   "referenced_type" : "type-88",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
    "linker_set_key" : "atrace_marker_fd",
    "name" : "atrace_marker_fd",
-   "referenced_type" : "type-18",
+   "referenced_type" : "type-12",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   }
  ],
@@ -2377,8 +2377,8 @@
    "alignment" : 4,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-108",
-   "self_type" : "type-107",
+   "referenced_type" : "type-10",
+   "self_type" : "type-9",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2386,8 +2386,8 @@
    "alignment" : 4,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-42",
-   "self_type" : "type-41",
+   "referenced_type" : "type-30",
+   "self_type" : "type-29",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2395,8 +2395,8 @@
    "alignment" : 4,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-64",
-   "self_type" : "type-63",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2413,8 +2413,8 @@
    "alignment" : 4,
    "linker_set_key" : "IoSchedClass *",
    "name" : "IoSchedClass *",
-   "referenced_type" : "type-10",
-   "self_type" : "type-9",
+   "referenced_type" : "type-8",
+   "self_type" : "type-7",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/iosched_policy.h"
   },
@@ -2422,24 +2422,6 @@
    "alignment" : 4,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-100",
-   "self_type" : "type-99",
-   "size" : 4,
-   "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "RecordStream *",
-   "name" : "RecordStream *",
-   "referenced_type" : "type-113",
-   "self_type" : "type-112",
-   "size" : 4,
-   "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "RecordStream *",
-   "name" : "RecordStream *",
    "referenced_type" : "type-26",
    "self_type" : "type-25",
    "size" : 4,
@@ -2449,8 +2431,8 @@
    "alignment" : 4,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-74",
-   "self_type" : "type-73",
+   "referenced_type" : "type-37",
+   "self_type" : "type-36",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2458,8 +2440,26 @@
    "alignment" : 4,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-85",
-   "self_type" : "type-84",
+   "referenced_type" : "type-49",
+   "self_type" : "type-48",
+   "size" : 4,
+   "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "RecordStream *",
+   "name" : "RecordStream *",
+   "referenced_type" : "type-64",
+   "self_type" : "type-63",
+   "size" : 4,
+   "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "RecordStream *",
+   "name" : "RecordStream *",
+   "referenced_type" : "type-87",
+   "self_type" : "type-86",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2467,8 +2467,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(void *, void *)",
    "name" : "bool (*)(void *, void *)",
-   "referenced_type" : "type-44",
-   "self_type" : "type-43",
+   "referenced_type" : "type-79",
+   "self_type" : "type-78",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2476,8 +2476,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(void *, void *, void *)",
    "name" : "bool (*)(void *, void *, void *)",
-   "referenced_type" : "type-46",
-   "self_type" : "type-48",
+   "referenced_type" : "type-81",
+   "self_type" : "type-83",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2486,7 +2486,7 @@
    "linker_set_key" : "char *",
    "name" : "char *",
    "referenced_type" : "type-5",
-   "self_type" : "type-51",
+   "self_type" : "type-75",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/config_utils.h"
   },
@@ -2494,8 +2494,8 @@
    "alignment" : 4,
    "linker_set_key" : "char16_t *",
    "name" : "char16_t *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-34",
+   "referenced_type" : "type-66",
+   "self_type" : "type-68",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
@@ -2521,8 +2521,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-31",
-   "self_type" : "type-33",
+   "referenced_type" : "type-65",
+   "self_type" : "type-67",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
@@ -2530,8 +2530,8 @@
    "alignment" : 4,
    "linker_set_key" : "const cutils_socket_buffer_t *",
    "name" : "const cutils_socket_buffer_t *",
-   "referenced_type" : "type-52",
-   "self_type" : "type-53",
+   "referenced_type" : "type-15",
+   "self_type" : "type-19",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
@@ -2539,8 +2539,8 @@
    "alignment" : 4,
    "linker_set_key" : "const iovec *",
    "name" : "const iovec *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-60",
+   "referenced_type" : "type-38",
+   "self_type" : "type-40",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2548,8 +2548,8 @@
    "alignment" : 4,
    "linker_set_key" : "const iovec *",
    "name" : "const iovec *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-88",
+   "referenced_type" : "type-54",
+   "self_type" : "type-56",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2557,8 +2557,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-23",
+   "referenced_type" : "type-31",
+   "self_type" : "type-32",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
@@ -2566,8 +2566,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-30",
-   "self_type" : "type-29",
+   "referenced_type" : "type-18",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
@@ -2575,8 +2575,8 @@
    "alignment" : 4,
    "linker_set_key" : "float *",
    "name" : "float *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-23",
+   "self_type" : "type-22",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
@@ -2584,8 +2584,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-49",
-   "self_type" : "type-50",
+   "referenced_type" : "type-84",
+   "self_type" : "type-85",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2593,8 +2593,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-18",
-   "self_type" : "type-17",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/iosched_policy.h"
   },
@@ -2602,8 +2602,8 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-24",
+   "referenced_type" : "type-27",
+   "self_type" : "type-33",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
@@ -2611,8 +2611,8 @@
    "alignment" : 4,
    "linker_set_key" : "str_parms *",
    "name" : "str_parms *",
-   "referenced_type" : "type-55",
-   "self_type" : "type-54",
+   "referenced_type" : "type-21",
+   "self_type" : "type-20",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
@@ -2620,8 +2620,8 @@
    "alignment" : 4,
    "linker_set_key" : "str_parms *",
    "name" : "str_parms *",
-   "referenced_type" : "type-70",
-   "self_type" : "type-69",
+   "referenced_type" : "type-35",
+   "self_type" : "type-34",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
@@ -2629,8 +2629,8 @@
    "alignment" : 4,
    "linker_set_key" : "str_parms *",
    "name" : "str_parms *",
-   "referenced_type" : "type-83",
-   "self_type" : "type-82",
+   "referenced_type" : "type-53",
+   "self_type" : "type-52",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
@@ -2638,8 +2638,8 @@
    "alignment" : 4,
    "linker_set_key" : "thread_store_t *",
    "name" : "thread_store_t *",
-   "referenced_type" : "type-35",
-   "self_type" : "type-37",
+   "referenced_type" : "type-69",
+   "self_type" : "type-71",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   },
@@ -2648,7 +2648,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-6",
-   "self_type" : "type-19",
+   "self_type" : "type-24",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/misc.h"
   },
@@ -2656,8 +2656,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(const char *, const char *, void *)",
    "name" : "void (*)(const char *, const char *, void *)",
-   "referenced_type" : "type-11",
-   "self_type" : "type-14",
+   "referenced_type" : "type-43",
+   "self_type" : "type-44",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
@@ -2665,8 +2665,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(void *)",
    "name" : "void (*)(void *)",
-   "referenced_type" : "type-38",
-   "self_type" : "type-39",
+   "referenced_type" : "type-72",
+   "self_type" : "type-73",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   },
@@ -2674,7 +2674,7 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-12",
+   "referenced_type" : "type-14",
    "self_type" : "type-13",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/misc.h"
@@ -2684,7 +2684,7 @@
    "linker_set_key" : "void **",
    "name" : "void **",
    "referenced_type" : "type-13",
-   "self_type" : "type-27",
+   "self_type" : "type-47",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   }
@@ -2706,8 +2706,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-32",
-   "self_type" : "type-31",
+   "referenced_type" : "type-66",
+   "self_type" : "type-65",
    "size" : 2,
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
@@ -2716,8 +2716,8 @@
    "is_const" : true,
    "linker_set_key" : "const cutils_socket_buffer_t",
    "name" : "const cutils_socket_buffer_t",
-   "referenced_type" : "type-28",
-   "self_type" : "type-52",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
@@ -2726,8 +2726,8 @@
    "is_const" : true,
    "linker_set_key" : "const iovec",
    "name" : "const iovec",
-   "referenced_type" : "type-59",
-   "self_type" : "type-58",
+   "referenced_type" : "type-39",
+   "self_type" : "type-38",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2736,8 +2736,8 @@
    "is_const" : true,
    "linker_set_key" : "const iovec",
    "name" : "const iovec",
-   "referenced_type" : "type-87",
-   "self_type" : "type-86",
+   "referenced_type" : "type-55",
+   "self_type" : "type-54",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2746,8 +2746,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-20",
-   "self_type" : "type-22",
+   "referenced_type" : "type-27",
+   "self_type" : "type-31",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
@@ -2755,8 +2755,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-12",
-   "self_type" : "type-30",
+   "referenced_type" : "type-14",
+   "self_type" : "type-18",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   }
  ],
@@ -2805,7 +2805,7 @@
    [
     {
      "field_name" : "data",
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-17"
     },
     {
      "field_name" : "length",
@@ -2815,8 +2815,8 @@
    ],
    "linker_set_key" : "cutils_socket_buffer_t",
    "name" : "cutils_socket_buffer_t",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h",
    "unique_id" : "cutils_socket_buffer_t"
@@ -2827,28 +2827,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-28"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -2859,23 +2859,23 @@
    [
     {
      "field_name" : "lock",
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-70"
     },
     {
      "field_name" : "has_tls",
      "field_offset" : 32,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     },
     {
      "field_name" : "tls",
      "field_offset" : 64,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-12"
     }
    ],
    "linker_set_key" : "thread_store_t",
    "name" : "thread_store_t",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/threads.h",
    "unique_id" : "thread_store_t"
diff --git a/Q/64/arm_armv8-a/source-based/libprocessgroup.so.lsdump b/Q/64/arm_armv8-a/source-based/libprocessgroup.so.lsdump
index d440dc4..c7f813e 100644
--- a/Q/64/arm_armv8-a/source-based/libprocessgroup.so.lsdump
+++ b/Q/64/arm_armv8-a/source-based/libprocessgroup.so.lsdump
@@ -8,8 +8,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
+   "referenced_type" : "type-5",
+   "self_type" : "type-5",
    "size" : 1
   },
   {
@@ -26,8 +26,8 @@
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 8
   },
   {
@@ -35,8 +35,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 4
   },
   {
@@ -61,8 +61,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 8
   },
   {
@@ -80,8 +80,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
    "size" : 1
   },
   {
@@ -120,15 +120,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-18",
-   "self_type" : "type-18",
+   "referenced_type" : "type-17",
+   "self_type" : "type-17",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-6",
-   "self_type" : "type-6"
+   "referenced_type" : "type-15",
+   "self_type" : "type-15"
   }
  ],
  "elf_functions" :
@@ -149,7 +149,31 @@
    "name" : "SetTaskProfiles"
   },
   {
-   "name" : "UsePerAppMemcg"
+   "name" : "_Z14UsePerAppMemcgv"
+  },
+  {
+   "name" : "_Z16killProcessGroupjii"
+  },
+  {
+   "name" : "_Z18createProcessGroupjib"
+  },
+  {
+   "name" : "_Z20killProcessGroupOncejii"
+  },
+  {
+   "name" : "_Z20setProcessGroupLimitjix"
+  },
+  {
+   "name" : "_Z22removeAllProcessGroupsv"
+  },
+  {
+   "name" : "_Z24setProcessGroupSoftLimitjix"
+  },
+  {
+   "name" : "_Z25setProcessGroupSwappinessjii"
+  },
+  {
+   "name" : "_ZN11TaskProfile21EnableResourceCachingEv"
   },
   {
    "name" : "_ZN12TaskProfiles11GetInstanceEv"
@@ -170,6 +194,9 @@
    "name" : "_ZN15SetCgroupAction18IsAppDependentPathERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
   },
   {
+   "name" : "_ZN15SetCgroupAction21EnableResourceCachingEv"
+  },
+  {
    "name" : "_ZN15SetCgroupActionC1ERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE"
   },
   {
@@ -733,36 +760,15 @@
    "name" : "cpusets_enabled"
   },
   {
-   "name" : "createProcessGroup"
-  },
-  {
    "name" : "get_sched_policy"
   },
   {
    "name" : "get_sched_policy_name"
   },
   {
-   "name" : "killProcessGroup"
-  },
-  {
-   "name" : "killProcessGroupOnce"
-  },
-  {
-   "name" : "removeAllProcessGroups"
-  },
-  {
    "name" : "schedboost_enabled"
   },
   {
-   "name" : "setProcessGroupLimit"
-  },
-  {
-   "name" : "setProcessGroupSoftLimit"
-  },
-  {
-   "name" : "setProcessGroupSwappiness"
-  },
-  {
    "name" : "set_cpuset_policy"
   },
   {
@@ -937,11 +943,11 @@
    ],
    "linker_set_key" : "SchedPolicy",
    "name" : "SchedPolicy",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
+   "referenced_type" : "type-11",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h",
-   "underlying_type" : "type-14",
+   "underlying_type" : "type-12",
    "unique_id" : "SchedPolicy"
   }
  ],
@@ -954,13 +960,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -969,16 +975,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -987,13 +993,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -1005,13 +1011,17 @@
      "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
      "referenced_type" : "type-35"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-5"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -1020,59 +1030,38 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
      "referenced_type" : "type-35"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-5"
     }
    ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "UsePerAppMemcg",
-   "linker_set_key" : "UsePerAppMemcg",
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
    "function_name" : "cpusets_enabled",
    "linker_set_key" : "cpusets_enabled",
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
-   "function_name" : "createProcessGroup",
-   "linker_set_key" : "createProcessGroup",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
    "function_name" : "get_sched_policy",
    "linker_set_key" : "get_sched_policy",
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
@@ -1081,127 +1070,31 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
    "return_type" : "type-1",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
-   "function_name" : "killProcessGroup",
-   "linker_set_key" : "killProcessGroup",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "killProcessGroupOnce",
-   "linker_set_key" : "killProcessGroupOnce",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "removeAllProcessGroups",
-   "linker_set_key" : "removeAllProcessGroups",
-   "return_type" : "type-6",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
    "function_name" : "schedboost_enabled",
    "linker_set_key" : "schedboost_enabled",
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
-   "function_name" : "setProcessGroupLimit",
-   "linker_set_key" : "setProcessGroupLimit",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-5"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "setProcessGroupSoftLimit",
-   "linker_set_key" : "setProcessGroupSoftLimit",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-5"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "setProcessGroupSwappiness",
-   "linker_set_key" : "setProcessGroupSwappiness",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
    "function_name" : "set_cpuset_policy",
    "linker_set_key" : "set_cpuset_policy",
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
@@ -1210,13 +1103,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   }
  ],
@@ -1236,8 +1129,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-8",
-   "self_type" : "type-10",
+   "referenced_type" : "type-6",
+   "self_type" : "type-8",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
@@ -1266,8 +1159,8 @@
    "alignment" : 4,
    "linker_set_key" : "SchedPolicy *",
    "name" : "SchedPolicy *",
-   "referenced_type" : "type-13",
-   "self_type" : "type-15",
+   "referenced_type" : "type-11",
+   "self_type" : "type-13",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
@@ -1284,8 +1177,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
+   "referenced_type" : "type-10",
+   "self_type" : "type-9",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
@@ -1336,8 +1229,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-9",
-   "self_type" : "type-8",
+   "referenced_type" : "type-7",
+   "self_type" : "type-6",
    "size" : 12,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
diff --git a/Q/64/x86/source-based/libcutils.so.lsdump b/Q/64/x86/source-based/libcutils.so.lsdump
index 9e865ad..33bb1f3 100644
--- a/Q/64/x86/source-based/libcutils.so.lsdump
+++ b/Q/64/x86/source-based/libcutils.so.lsdump
@@ -18,8 +18,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 1
   },
   {
@@ -37,16 +37,16 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-56",
-   "self_type" : "type-56",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 2
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 4
   },
   {
@@ -63,8 +63,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 8
   },
   {
@@ -72,8 +72,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 1
   },
   {
@@ -92,8 +92,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 8
   },
   {
@@ -102,8 +102,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-34",
+   "self_type" : "type-34",
    "size" : 2
   },
   {
@@ -545,9 +545,9 @@
      "referenced_type" : "type-11"
     }
    ],
-   "referenced_type" : "type-68",
-   "return_type" : "type-69",
-   "self_type" : "type-68",
+   "referenced_type" : "type-38",
+   "return_type" : "type-39",
+   "self_type" : "type-38",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -566,9 +566,9 @@
      "referenced_type" : "type-11"
     }
    ],
-   "referenced_type" : "type-70",
-   "return_type" : "type-71",
-   "self_type" : "type-70",
+   "referenced_type" : "type-40",
+   "return_type" : "type-41",
+   "self_type" : "type-40",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -581,9 +581,9 @@
      "referenced_type" : "type-11"
     }
    ],
-   "referenced_type" : "type-73",
+   "referenced_type" : "type-43",
    "return_type" : "type-10",
-   "self_type" : "type-73",
+   "self_type" : "type-43",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -602,9 +602,9 @@
      "referenced_type" : "type-11"
     }
    ],
-   "referenced_type" : "type-40",
+   "referenced_type" : "type-58",
    "return_type" : "type-12",
-   "self_type" : "type-40",
+   "self_type" : "type-58",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -617,9 +617,9 @@
      "referenced_type" : "type-11"
     }
    ],
-   "referenced_type" : "type-62",
+   "referenced_type" : "type-32",
    "return_type" : "type-12",
-   "self_type" : "type-62",
+   "self_type" : "type-32",
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   }
  ],
@@ -856,7 +856,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-57"
     }
    ],
    "return_type" : "type-12",
@@ -883,7 +883,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-61"
     }
    ],
    "return_type" : "type-12",
@@ -895,7 +895,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-61"
     }
    ],
    "return_type" : "type-12",
@@ -967,7 +967,7 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-45"
     }
    ],
    "return_type" : "type-12",
@@ -1048,7 +1048,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-34"
     }
    ],
    "return_type" : "type-10",
@@ -1063,7 +1063,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-34"
     },
     {
      "referenced_type" : "type-6"
@@ -1084,7 +1084,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-34"
     },
     {
      "referenced_type" : "type-6"
@@ -1105,7 +1105,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-34"
     },
     {
      "referenced_type" : "type-6"
@@ -1156,13 +1156,13 @@
      "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-74"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-65",
+   "return_type" : "type-35",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1171,10 +1171,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-35"
     },
     {
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-42"
     },
     {
      "referenced_type" : "type-11"
@@ -1189,7 +1189,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-35"
     }
    ],
    "return_type" : "type-12",
@@ -1201,7 +1201,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-35"
     },
     {
      "referenced_type" : "type-11"
@@ -1231,7 +1231,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-35"
     }
    ],
    "return_type" : "type-12",
@@ -1243,7 +1243,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-35"
     },
     {
      "referenced_type" : "type-11"
@@ -1261,7 +1261,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-35"
     },
     {
      "referenced_type" : "type-11"
@@ -1276,7 +1276,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-35"
     }
    ],
    "return_type" : "type-12",
@@ -1318,7 +1318,7 @@
      "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-37"
+     "referenced_type" : "type-54"
     },
     {
      "referenced_type" : "type-10"
@@ -1510,7 +1510,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-45"
     },
     {
      "referenced_type" : "type-10"
@@ -1543,7 +1543,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-45"
     },
     {
      "referenced_type" : "type-3"
@@ -1561,10 +1561,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-56"
     }
    ],
-   "return_type" : "type-38",
+   "return_type" : "type-56",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1591,10 +1591,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-57"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-57",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1603,7 +1603,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-60"
     },
     {
      "referenced_type" : "type-11"
@@ -1837,7 +1837,7 @@
      "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-28"
+     "referenced_type" : "type-87"
     },
     {
      "referenced_type" : "type-6"
@@ -1867,13 +1867,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-46"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-49"
     }
    ],
    "return_type" : "type-10",
@@ -1885,7 +1885,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-46"
     },
     {
      "referenced_type" : "type-3"
@@ -1903,7 +1903,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-46"
     },
     {
      "referenced_type" : "type-3"
@@ -1918,7 +1918,7 @@
   {
    "function_name" : "str_parms_create",
    "linker_set_key" : "str_parms_create",
-   "return_type" : "type-30",
+   "return_type" : "type-46",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1930,7 +1930,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-30",
+   "return_type" : "type-46",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1939,7 +1939,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-46"
     },
     {
      "referenced_type" : "type-3"
@@ -1954,7 +1954,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-46"
     }
    ],
    "return_type" : "type-12",
@@ -1966,7 +1966,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-46"
     }
    ],
    "return_type" : "type-12",
@@ -1978,13 +1978,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-46"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-32"
+     "referenced_type" : "type-48"
     }
    ],
    "return_type" : "type-10",
@@ -1996,7 +1996,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-46"
     },
     {
      "referenced_type" : "type-3"
@@ -2014,13 +2014,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-46"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-45"
     },
     {
      "referenced_type" : "type-10"
@@ -2035,7 +2035,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-46"
     },
     {
      "referenced_type" : "type-3"
@@ -2050,10 +2050,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-46"
     }
    ],
-   "return_type" : "type-25",
+   "return_type" : "type-45",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2062,7 +2062,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-58"
+     "referenced_type" : "type-28"
     },
     {
      "referenced_type" : "type-3"
@@ -2071,7 +2071,7 @@
      "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-58",
+   "return_type" : "type-28",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2080,7 +2080,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-58"
+     "referenced_type" : "type-28"
     },
     {
      "referenced_type" : "type-3"
@@ -2092,7 +2092,7 @@
      "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-58",
+   "return_type" : "type-28",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2107,7 +2107,7 @@
      "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-58",
+   "return_type" : "type-28",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2128,16 +2128,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-57"
+     "referenced_type" : "type-27"
     },
     {
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-25",
+   "return_type" : "type-45",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2146,13 +2146,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-57"
+     "referenced_type" : "type-27"
     },
     {
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-25",
+   "return_type" : "type-45",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2161,7 +2161,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-57"
+     "referenced_type" : "type-27"
     },
     {
      "referenced_type" : "type-6"
@@ -2176,7 +2176,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-31"
     }
    ],
    "return_type" : "type-11",
@@ -2188,13 +2188,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-31"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-63"
+     "referenced_type" : "type-33"
     }
    ],
    "return_type" : "type-12",
@@ -2254,7 +2254,7 @@
      "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-61"
     },
     {
      "referenced_type" : "type-13"
@@ -2272,7 +2272,7 @@
      "referenced_type" : "type-10"
     },
     {
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-61"
     }
    ],
    "return_type" : "type-10",
@@ -2284,13 +2284,13 @@
   {
    "linker_set_key" : "atrace_enabled_tags",
    "name" : "atrace_enabled_tags",
-   "referenced_type" : "type-44",
+   "referenced_type" : "type-62",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
    "linker_set_key" : "atrace_is_ready",
    "name" : "atrace_is_ready",
-   "referenced_type" : "type-80",
+   "referenced_type" : "type-88",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
@@ -2307,8 +2307,8 @@
    "alignment" : 4,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-100",
+   "referenced_type" : "type-109",
+   "self_type" : "type-108",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2316,8 +2316,8 @@
    "alignment" : 4,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-132",
-   "self_type" : "type-131",
+   "referenced_type" : "type-140",
+   "self_type" : "type-139",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2325,8 +2325,8 @@
    "alignment" : 4,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-66",
-   "self_type" : "type-65",
+   "referenced_type" : "type-36",
+   "self_type" : "type-35",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2334,8 +2334,8 @@
    "alignment" : 4,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-78",
+   "referenced_type" : "type-82",
+   "self_type" : "type-81",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2352,8 +2352,8 @@
    "alignment" : 4,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-122",
-   "self_type" : "type-121",
+   "referenced_type" : "type-130",
+   "self_type" : "type-129",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2370,8 +2370,8 @@
    "alignment" : 4,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-52",
-   "self_type" : "type-51",
+   "referenced_type" : "type-70",
+   "self_type" : "type-69",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2379,8 +2379,8 @@
    "alignment" : 4,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-76",
+   "referenced_type" : "type-74",
+   "self_type" : "type-73",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2388,8 +2388,8 @@
    "alignment" : 4,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-90",
+   "referenced_type" : "type-99",
+   "self_type" : "type-98",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2397,8 +2397,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(void *, void *)",
    "name" : "bool (*)(void *, void *)",
-   "referenced_type" : "type-68",
-   "self_type" : "type-67",
+   "referenced_type" : "type-38",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2406,8 +2406,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(void *, void *, void *)",
    "name" : "bool (*)(void *, void *, void *)",
-   "referenced_type" : "type-70",
-   "self_type" : "type-72",
+   "referenced_type" : "type-40",
+   "self_type" : "type-42",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2416,7 +2416,7 @@
    "linker_set_key" : "char *",
    "name" : "char *",
    "referenced_type" : "type-5",
-   "self_type" : "type-25",
+   "self_type" : "type-45",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/config_utils.h"
   },
@@ -2424,8 +2424,8 @@
    "alignment" : 4,
    "linker_set_key" : "char16_t *",
    "name" : "char16_t *",
-   "referenced_type" : "type-56",
-   "self_type" : "type-58",
+   "referenced_type" : "type-26",
+   "self_type" : "type-28",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
@@ -2451,8 +2451,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-55",
-   "self_type" : "type-57",
+   "referenced_type" : "type-25",
+   "self_type" : "type-27",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
@@ -2460,8 +2460,8 @@
    "alignment" : 4,
    "linker_set_key" : "const cutils_socket_buffer_t *",
    "name" : "const cutils_socket_buffer_t *",
-   "referenced_type" : "type-27",
-   "self_type" : "type-28",
+   "referenced_type" : "type-86",
+   "self_type" : "type-87",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
@@ -2469,8 +2469,8 @@
    "alignment" : 4,
    "linker_set_key" : "const iovec *",
    "name" : "const iovec *",
-   "referenced_type" : "type-142",
-   "self_type" : "type-144",
+   "referenced_type" : "type-150",
+   "self_type" : "type-152",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2478,8 +2478,8 @@
    "alignment" : 4,
    "linker_set_key" : "const iovec *",
    "name" : "const iovec *",
-   "referenced_type" : "type-35",
-   "self_type" : "type-37",
+   "referenced_type" : "type-51",
+   "self_type" : "type-54",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2505,8 +2505,8 @@
    "alignment" : 4,
    "linker_set_key" : "float *",
    "name" : "float *",
-   "referenced_type" : "type-33",
-   "self_type" : "type-32",
+   "referenced_type" : "type-49",
+   "self_type" : "type-48",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
@@ -2514,8 +2514,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-73",
-   "self_type" : "type-74",
+   "referenced_type" : "type-43",
+   "self_type" : "type-44",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2541,8 +2541,8 @@
    "alignment" : 4,
    "linker_set_key" : "str_parms *",
    "name" : "str_parms *",
-   "referenced_type" : "type-109",
-   "self_type" : "type-108",
+   "referenced_type" : "type-117",
+   "self_type" : "type-116",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
@@ -2550,8 +2550,8 @@
    "alignment" : 4,
    "linker_set_key" : "str_parms *",
    "name" : "str_parms *",
-   "referenced_type" : "type-140",
-   "self_type" : "type-139",
+   "referenced_type" : "type-148",
+   "self_type" : "type-147",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
@@ -2559,8 +2559,8 @@
    "alignment" : 4,
    "linker_set_key" : "str_parms *",
    "name" : "str_parms *",
-   "referenced_type" : "type-31",
-   "self_type" : "type-30",
+   "referenced_type" : "type-47",
+   "self_type" : "type-46",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
@@ -2568,8 +2568,8 @@
    "alignment" : 4,
    "linker_set_key" : "thread_store_t *",
    "name" : "thread_store_t *",
-   "referenced_type" : "type-59",
-   "self_type" : "type-61",
+   "referenced_type" : "type-29",
+   "self_type" : "type-31",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   },
@@ -2586,8 +2586,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(const char *, const char *, void *)",
    "name" : "void (*)(const char *, const char *, void *)",
-   "referenced_type" : "type-40",
-   "self_type" : "type-42",
+   "referenced_type" : "type-58",
+   "self_type" : "type-60",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
@@ -2595,8 +2595,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(void *)",
    "name" : "void (*)(void *)",
-   "referenced_type" : "type-62",
-   "self_type" : "type-63",
+   "referenced_type" : "type-32",
+   "self_type" : "type-33",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   },
@@ -2636,8 +2636,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-56",
-   "self_type" : "type-55",
+   "referenced_type" : "type-26",
+   "self_type" : "type-25",
    "size" : 2,
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
@@ -2647,7 +2647,7 @@
    "linker_set_key" : "const cutils_socket_buffer_t",
    "name" : "const cutils_socket_buffer_t",
    "referenced_type" : "type-22",
-   "self_type" : "type-27",
+   "self_type" : "type-86",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
@@ -2656,8 +2656,8 @@
    "is_const" : true,
    "linker_set_key" : "const iovec",
    "name" : "const iovec",
-   "referenced_type" : "type-143",
-   "self_type" : "type-142",
+   "referenced_type" : "type-151",
+   "self_type" : "type-150",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2666,8 +2666,8 @@
    "is_const" : true,
    "linker_set_key" : "const iovec",
    "name" : "const iovec",
-   "referenced_type" : "type-36",
-   "self_type" : "type-35",
+   "referenced_type" : "type-52",
+   "self_type" : "type-51",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2789,7 +2789,7 @@
    [
     {
      "field_name" : "lock",
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-30"
     },
     {
      "field_name" : "has_tls",
@@ -2804,8 +2804,8 @@
    ],
    "linker_set_key" : "thread_store_t",
    "name" : "thread_store_t",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/threads.h",
    "unique_id" : "thread_store_t"
diff --git a/Q/64/x86/source-based/libprocessgroup.so.lsdump b/Q/64/x86/source-based/libprocessgroup.so.lsdump
index 1b73438..f5753e4 100644
--- a/Q/64/x86/source-based/libprocessgroup.so.lsdump
+++ b/Q/64/x86/source-based/libprocessgroup.so.lsdump
@@ -8,8 +8,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
+   "referenced_type" : "type-5",
+   "self_type" : "type-5",
    "size" : 1
   },
   {
@@ -26,34 +26,19 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 4
   },
   {
    "alignment" : 4,
    "is_integral" : true,
-   "linker_set_key" : "long long",
-   "name" : "long long",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
-   "size" : 8
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
    "referenced_type" : "type-4",
    "self_type" : "type-4",
    "size" : 4
-  },
-  {
-   "linker_set_key" : "void",
-   "name" : "void",
-   "referenced_type" : "type-6",
-   "self_type" : "type-6"
   }
  ],
  "elf_functions" :
@@ -74,7 +59,31 @@
    "name" : "SetTaskProfiles"
   },
   {
-   "name" : "UsePerAppMemcg"
+   "name" : "_Z14UsePerAppMemcgv"
+  },
+  {
+   "name" : "_Z16killProcessGroupjii"
+  },
+  {
+   "name" : "_Z18createProcessGroupjib"
+  },
+  {
+   "name" : "_Z20killProcessGroupOncejii"
+  },
+  {
+   "name" : "_Z20setProcessGroupLimitjix"
+  },
+  {
+   "name" : "_Z22removeAllProcessGroupsv"
+  },
+  {
+   "name" : "_Z24setProcessGroupSoftLimitjix"
+  },
+  {
+   "name" : "_Z25setProcessGroupSwappinessjii"
+  },
+  {
+   "name" : "_ZN11TaskProfile21EnableResourceCachingEv"
   },
   {
    "name" : "_ZN12TaskProfiles11GetInstanceEv"
@@ -95,6 +104,9 @@
    "name" : "_ZN15SetCgroupAction18IsAppDependentPathERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
   },
   {
+   "name" : "_ZN15SetCgroupAction21EnableResourceCachingEv"
+  },
+  {
    "name" : "_ZN15SetCgroupActionC1ERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE"
   },
   {
@@ -601,36 +613,15 @@
    "name" : "cpusets_enabled"
   },
   {
-   "name" : "createProcessGroup"
-  },
-  {
    "name" : "get_sched_policy"
   },
   {
    "name" : "get_sched_policy_name"
   },
   {
-   "name" : "killProcessGroup"
-  },
-  {
-   "name" : "killProcessGroupOnce"
-  },
-  {
-   "name" : "removeAllProcessGroups"
-  },
-  {
    "name" : "schedboost_enabled"
   },
   {
-   "name" : "setProcessGroupLimit"
-  },
-  {
-   "name" : "setProcessGroupSoftLimit"
-  },
-  {
-   "name" : "setProcessGroupSwappiness"
-  },
-  {
    "name" : "set_cpuset_policy"
   },
   {
@@ -805,11 +796,11 @@
    ],
    "linker_set_key" : "SchedPolicy",
    "name" : "SchedPolicy",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
+   "referenced_type" : "type-11",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h",
-   "underlying_type" : "type-14",
+   "underlying_type" : "type-12",
    "unique_id" : "SchedPolicy"
   }
  ],
@@ -822,13 +813,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -837,16 +828,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -855,13 +846,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -873,13 +864,17 @@
      "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-17"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-5"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -888,59 +883,38 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-17"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-5"
     }
    ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "UsePerAppMemcg",
-   "linker_set_key" : "UsePerAppMemcg",
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
    "function_name" : "cpusets_enabled",
    "linker_set_key" : "cpusets_enabled",
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
-   "function_name" : "createProcessGroup",
-   "linker_set_key" : "createProcessGroup",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
    "function_name" : "get_sched_policy",
    "linker_set_key" : "get_sched_policy",
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
@@ -949,127 +923,31 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
    "return_type" : "type-1",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
-   "function_name" : "killProcessGroup",
-   "linker_set_key" : "killProcessGroup",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "killProcessGroupOnce",
-   "linker_set_key" : "killProcessGroupOnce",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "removeAllProcessGroups",
-   "linker_set_key" : "removeAllProcessGroups",
-   "return_type" : "type-6",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
    "function_name" : "schedboost_enabled",
    "linker_set_key" : "schedboost_enabled",
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
-   "function_name" : "setProcessGroupLimit",
-   "linker_set_key" : "setProcessGroupLimit",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-5"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "setProcessGroupSoftLimit",
-   "linker_set_key" : "setProcessGroupSoftLimit",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-5"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "setProcessGroupSwappiness",
-   "linker_set_key" : "setProcessGroupSwappiness",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
    "function_name" : "set_cpuset_policy",
    "linker_set_key" : "set_cpuset_policy",
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
@@ -1078,13 +956,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   }
  ],
@@ -1095,8 +973,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-8",
-   "self_type" : "type-10",
+   "referenced_type" : "type-6",
+   "self_type" : "type-8",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
@@ -1104,8 +982,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
    "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
-   "referenced_type" : "type-17",
-   "self_type" : "type-19",
+   "referenced_type" : "type-15",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   }
@@ -1116,8 +994,8 @@
    "alignment" : 4,
    "linker_set_key" : "SchedPolicy *",
    "name" : "SchedPolicy *",
-   "referenced_type" : "type-13",
-   "self_type" : "type-15",
+   "referenced_type" : "type-11",
+   "self_type" : "type-13",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
@@ -1134,8 +1012,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
+   "referenced_type" : "type-10",
+   "self_type" : "type-9",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   }
@@ -1158,7 +1036,7 @@
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
    "referenced_type" : "type-1",
-   "self_type" : "type-16",
+   "self_type" : "type-14",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
@@ -1167,8 +1045,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-9",
-   "self_type" : "type-8",
+   "referenced_type" : "type-7",
+   "self_type" : "type-6",
    "size" : 12,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
@@ -1177,8 +1055,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
    "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
-   "referenced_type" : "type-18",
-   "self_type" : "type-17",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 12,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   }
diff --git a/Q/64/x86_64/source-based/libcutils.so.lsdump b/Q/64/x86_64/source-based/libcutils.so.lsdump
index ba2c1a9..cfaef09 100644
--- a/Q/64/x86_64/source-based/libcutils.so.lsdump
+++ b/Q/64/x86_64/source-based/libcutils.so.lsdump
@@ -5,8 +5,8 @@
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-10",
-   "self_type" : "type-15",
+   "referenced_type" : "type-14",
+   "self_type" : "type-26",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   }
  ],
@@ -18,8 +18,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 1
   },
   {
@@ -37,16 +37,16 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
+   "referenced_type" : "type-41",
+   "self_type" : "type-41",
    "size" : 2
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-10",
+   "self_type" : "type-10",
    "size" : 4
   },
   {
@@ -54,8 +54,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 4
   },
   {
@@ -63,8 +63,8 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 8
   },
   {
@@ -72,8 +72,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 1
   },
   {
@@ -92,15 +92,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 8
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12"
+   "referenced_type" : "type-19",
+   "self_type" : "type-19"
   }
  ],
  "elf_functions" :
@@ -491,8 +491,8 @@
    ],
    "linker_set_key" : "IoSchedClass",
    "name" : "IoSchedClass",
-   "referenced_type" : "type-8",
-   "self_type" : "type-8",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/iosched_policy.h",
    "underlying_type" : "type-6",
@@ -508,15 +508,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-18"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-18"
     }
    ],
-   "referenced_type" : "type-39",
-   "return_type" : "type-40",
-   "self_type" : "type-39",
+   "referenced_type" : "type-53",
+   "return_type" : "type-54",
+   "self_type" : "type-53",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -526,18 +526,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-18"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-18"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-18"
     }
    ],
-   "referenced_type" : "type-41",
-   "return_type" : "type-42",
-   "self_type" : "type-41",
+   "referenced_type" : "type-55",
+   "return_type" : "type-56",
+   "self_type" : "type-55",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -547,12 +547,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-18"
     }
    ],
-   "referenced_type" : "type-44",
-   "return_type" : "type-10",
-   "self_type" : "type-44",
+   "referenced_type" : "type-58",
+   "return_type" : "type-14",
+   "self_type" : "type-58",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -568,12 +568,12 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-18"
     }
    ],
-   "referenced_type" : "type-59",
-   "return_type" : "type-12",
-   "self_type" : "type-59",
+   "referenced_type" : "type-21",
+   "return_type" : "type-19",
+   "self_type" : "type-21",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -583,12 +583,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-18"
     }
    ],
-   "referenced_type" : "type-34",
-   "return_type" : "type-12",
-   "self_type" : "type-34",
+   "referenced_type" : "type-47",
+   "return_type" : "type-19",
+   "self_type" : "type-47",
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   }
  ],
@@ -603,7 +603,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/android_get_control_file.h"
   },
   {
@@ -615,7 +615,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -624,16 +624,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-7"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-9"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/iosched_policy.h"
   },
   {
@@ -645,13 +645,13 @@
      "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/android_reboot.h"
   },
   {
@@ -660,16 +660,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-8"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/iosched_policy.h"
   },
   {
@@ -681,10 +681,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -693,16 +693,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
    "function_name" : "ashmem_init",
    "linker_set_key" : "ashmem_init",
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -711,16 +711,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -729,13 +729,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -744,16 +744,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -762,10 +762,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -777,10 +777,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
@@ -792,10 +792,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
@@ -807,13 +807,13 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
    "function_name" : "atrace_end_body",
    "linker_set_key" : "atrace_end_body",
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
@@ -825,10 +825,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
@@ -840,10 +840,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
@@ -852,10 +852,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-63"
+     "referenced_type" : "type-23"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
@@ -864,22 +864,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-63"
+     "referenced_type" : "type-23"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
    "function_name" : "atrace_setup",
    "linker_set_key" : "atrace_setup",
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
    "function_name" : "atrace_update_tags",
    "linker_set_key" : "atrace_update_tags",
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
@@ -894,10 +894,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/config_utils.h"
   },
   {
@@ -924,7 +924,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/config_utils.h"
   },
   {
@@ -936,10 +936,10 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-49"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/config_utils.h"
   },
   {
@@ -954,7 +954,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/config_utils.h"
   },
   {
@@ -987,7 +987,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/config_utils.h"
   },
   {
@@ -1020,7 +1020,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1041,7 +1041,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1062,7 +1062,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1083,7 +1083,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1095,10 +1095,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-9"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1110,10 +1110,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1122,16 +1122,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-59"
     },
     {
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-52"
     }
    ],
-   "return_type" : "type-36",
+   "return_type" : "type-50",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1140,16 +1140,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-57"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-18"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1158,10 +1158,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1170,13 +1170,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-18"
     }
    ],
-   "return_type" : "type-11",
+   "return_type" : "type-18",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1185,13 +1185,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-18"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1200,10 +1200,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1212,16 +1212,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-18"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-18"
     }
    ],
-   "return_type" : "type-11",
+   "return_type" : "type-18",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1230,13 +1230,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-18"
     }
    ],
-   "return_type" : "type-11",
+   "return_type" : "type-18",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1245,10 +1245,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1257,10 +1257,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
   {
@@ -1269,13 +1269,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
   {
@@ -1284,16 +1284,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-17"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
   {
@@ -1305,10 +1305,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-24"
     }
    ],
-   "return_type" : "type-11",
+   "return_type" : "type-18",
    "source_file" : "/system/core/libcutils/include/cutils/misc.h"
   },
   {
@@ -1428,10 +1428,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-29",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1440,10 +1440,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-28"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1452,13 +1452,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-29",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1467,10 +1467,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1479,16 +1479,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-49"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-18",
+   "return_type" : "type-29",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1500,7 +1500,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/partition_utils.h"
   },
   {
@@ -1512,13 +1512,13 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-49"
     },
     {
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1530,10 +1530,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-57"
+     "referenced_type" : "type-20"
     }
    ],
-   "return_type" : "type-57",
+   "return_type" : "type-20",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1545,10 +1545,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1560,10 +1560,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-60"
     }
    ],
-   "return_type" : "type-47",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1572,13 +1572,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-22"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-18"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1593,7 +1593,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1602,10 +1602,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
   {
@@ -1614,16 +1614,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-33"
     },
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-34"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
   {
@@ -1632,13 +1632,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-19",
+   "return_type" : "type-30",
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
   {
@@ -1647,10 +1647,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1659,10 +1659,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1671,13 +1671,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1689,13 +1689,13 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1704,19 +1704,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1728,13 +1728,13 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1743,16 +1743,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1764,13 +1764,13 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1782,19 +1782,19 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-9"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1803,16 +1803,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-62"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-47",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1821,13 +1821,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1836,25 +1836,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-50"
-    },
-    {
-     "referenced_type" : "type-3"
-    },
-    {
-     "referenced_type" : "type-53"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
-  },
-  {
-   "function_name" : "str_parms_add_int",
-   "linker_set_key" : "str_parms_add_int",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-7"
     },
     {
      "referenced_type" : "type-3"
@@ -1863,7 +1845,25 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
+   "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
+  },
+  {
+   "function_name" : "str_parms_add_int",
+   "linker_set_key" : "str_parms_add_int",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-7"
+    },
+    {
+     "referenced_type" : "type-3"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1872,7 +1872,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-7"
     },
     {
      "referenced_type" : "type-3"
@@ -1881,13 +1881,13 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
    "function_name" : "str_parms_create",
    "linker_set_key" : "str_parms_create",
-   "return_type" : "type-50",
+   "return_type" : "type-7",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1899,7 +1899,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-50",
+   "return_type" : "type-7",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1908,13 +1908,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-7"
     },
     {
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1923,10 +1923,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-7"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1935,10 +1935,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-7"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1947,25 +1947,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-50"
-    },
-    {
-     "referenced_type" : "type-3"
-    },
-    {
-     "referenced_type" : "type-52"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
-  },
-  {
-   "function_name" : "str_parms_get_int",
-   "linker_set_key" : "str_parms_get_int",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-7"
     },
     {
      "referenced_type" : "type-3"
@@ -1974,7 +1956,25 @@
      "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
+   "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
+  },
+  {
+   "function_name" : "str_parms_get_int",
+   "linker_set_key" : "str_parms_get_int",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-7"
+    },
+    {
+     "referenced_type" : "type-3"
+    },
+    {
+     "referenced_type" : "type-13"
+    }
+   ],
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1983,19 +1983,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-7"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-49"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2004,13 +2004,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-7"
     },
     {
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2019,10 +2019,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-7"
     }
    ],
-   "return_type" : "type-46",
+   "return_type" : "type-49",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2031,16 +2031,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-43"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-34"
     }
    ],
-   "return_type" : "type-30",
+   "return_type" : "type-43",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2049,19 +2049,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-43"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-34"
     }
    ],
-   "return_type" : "type-30",
+   "return_type" : "type-43",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2073,10 +2073,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-34"
     }
    ],
-   "return_type" : "type-30",
+   "return_type" : "type-43",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2088,7 +2088,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-21",
+   "return_type" : "type-32",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2097,16 +2097,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-49"
     },
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-42"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-46",
+   "return_type" : "type-49",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2115,13 +2115,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-42"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-46",
+   "return_type" : "type-49",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2130,13 +2130,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-29"
+     "referenced_type" : "type-42"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-21",
+   "return_type" : "type-32",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2145,10 +2145,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-46"
     }
    ],
-   "return_type" : "type-11",
+   "return_type" : "type-18",
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   },
   {
@@ -2157,16 +2157,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-46"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-18"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-12",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   },
   {
@@ -2175,16 +2175,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-18"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-47",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libcutils/include/cutils/uevent.h"
   },
   {
@@ -2193,19 +2193,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-18"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-24"
     }
    ],
-   "return_type" : "type-47",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libcutils/include/cutils/uevent.h"
   },
   {
@@ -2214,22 +2214,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-18"
     },
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-63"
+     "referenced_type" : "type-23"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-24"
     }
    ],
-   "return_type" : "type-47",
+   "return_type" : "type-60",
    "source_file" : "/system/core/libcutils/include/cutils/uevent.h"
   },
   {
@@ -2238,13 +2238,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-63"
+     "referenced_type" : "type-23"
     }
    ],
-   "return_type" : "type-10",
+   "return_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/uevent.h"
   }
  ],
@@ -2253,19 +2253,19 @@
   {
    "linker_set_key" : "atrace_enabled_tags",
    "name" : "atrace_enabled_tags",
-   "referenced_type" : "type-21",
+   "referenced_type" : "type-32",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
    "linker_set_key" : "atrace_is_ready",
    "name" : "atrace_is_ready",
-   "referenced_type" : "type-92",
+   "referenced_type" : "type-63",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
    "linker_set_key" : "atrace_marker_fd",
    "name" : "atrace_marker_fd",
-   "referenced_type" : "type-10",
+   "referenced_type" : "type-14",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   }
  ],
@@ -2276,8 +2276,8 @@
    "alignment" : 8,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-127",
+   "referenced_type" : "type-111",
+   "self_type" : "type-110",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2285,8 +2285,8 @@
    "alignment" : 8,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
+   "referenced_type" : "type-146",
+   "self_type" : "type-145",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2294,8 +2294,8 @@
    "alignment" : 8,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-82",
-   "self_type" : "type-81",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2303,8 +2303,8 @@
    "alignment" : 8,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-95",
-   "self_type" : "type-94",
+   "referenced_type" : "type-85",
+   "self_type" : "type-84",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2312,8 +2312,8 @@
    "alignment" : 8,
    "linker_set_key" : "IoSchedClass *",
    "name" : "IoSchedClass *",
-   "referenced_type" : "type-8",
-   "self_type" : "type-7",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/iosched_policy.h"
   },
@@ -2321,8 +2321,8 @@
    "alignment" : 8,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-114",
-   "self_type" : "type-113",
+   "referenced_type" : "type-100",
+   "self_type" : "type-99",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2330,8 +2330,8 @@
    "alignment" : 8,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-120",
-   "self_type" : "type-119",
+   "referenced_type" : "type-135",
+   "self_type" : "type-134",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2339,8 +2339,8 @@
    "alignment" : 8,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-133",
-   "self_type" : "type-132",
+   "referenced_type" : "type-31",
+   "self_type" : "type-30",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2348,8 +2348,8 @@
    "alignment" : 8,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-19",
+   "referenced_type" : "type-39",
+   "self_type" : "type-38",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2357,8 +2357,8 @@
    "alignment" : 8,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-72",
-   "self_type" : "type-71",
+   "referenced_type" : "type-74",
+   "self_type" : "type-73",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2366,8 +2366,8 @@
    "alignment" : 8,
    "linker_set_key" : "bool (*)(void *, void *)",
    "name" : "bool (*)(void *, void *)",
-   "referenced_type" : "type-39",
-   "self_type" : "type-38",
+   "referenced_type" : "type-53",
+   "self_type" : "type-52",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2375,8 +2375,8 @@
    "alignment" : 8,
    "linker_set_key" : "bool (*)(void *, void *, void *)",
    "name" : "bool (*)(void *, void *, void *)",
-   "referenced_type" : "type-41",
-   "self_type" : "type-43",
+   "referenced_type" : "type-55",
+   "self_type" : "type-57",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2385,7 +2385,7 @@
    "linker_set_key" : "char *",
    "name" : "char *",
    "referenced_type" : "type-5",
-   "self_type" : "type-46",
+   "self_type" : "type-49",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/config_utils.h"
   },
@@ -2393,8 +2393,8 @@
    "alignment" : 8,
    "linker_set_key" : "char16_t *",
    "name" : "char16_t *",
-   "referenced_type" : "type-28",
-   "self_type" : "type-30",
+   "referenced_type" : "type-41",
+   "self_type" : "type-43",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
@@ -2420,8 +2420,8 @@
    "alignment" : 8,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-27",
-   "self_type" : "type-29",
+   "referenced_type" : "type-40",
+   "self_type" : "type-42",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
@@ -2429,8 +2429,8 @@
    "alignment" : 8,
    "linker_set_key" : "const cutils_socket_buffer_t *",
    "name" : "const cutils_socket_buffer_t *",
-   "referenced_type" : "type-48",
-   "self_type" : "type-49",
+   "referenced_type" : "type-61",
+   "self_type" : "type-62",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
@@ -2438,8 +2438,8 @@
    "alignment" : 8,
    "linker_set_key" : "const iovec *",
    "name" : "const iovec *",
-   "referenced_type" : "type-104",
-   "self_type" : "type-106",
+   "referenced_type" : "type-122",
+   "self_type" : "type-121",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2447,8 +2447,8 @@
    "alignment" : 8,
    "linker_set_key" : "const iovec *",
    "name" : "const iovec *",
-   "referenced_type" : "type-55",
-   "self_type" : "type-54",
+   "referenced_type" : "type-15",
+   "self_type" : "type-17",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2456,8 +2456,8 @@
    "alignment" : 8,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-16",
-   "self_type" : "type-17",
+   "referenced_type" : "type-27",
+   "self_type" : "type-28",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
@@ -2465,8 +2465,8 @@
    "alignment" : 8,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-26",
-   "self_type" : "type-25",
+   "referenced_type" : "type-37",
+   "self_type" : "type-36",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
@@ -2474,8 +2474,8 @@
    "alignment" : 8,
    "linker_set_key" : "float *",
    "name" : "float *",
-   "referenced_type" : "type-53",
-   "self_type" : "type-52",
+   "referenced_type" : "type-10",
+   "self_type" : "type-9",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
@@ -2483,8 +2483,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-44",
-   "self_type" : "type-45",
+   "referenced_type" : "type-58",
+   "self_type" : "type-59",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2492,8 +2492,8 @@
    "alignment" : 8,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-10",
-   "self_type" : "type-9",
+   "referenced_type" : "type-14",
+   "self_type" : "type-13",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/iosched_policy.h"
   },
@@ -2501,8 +2501,8 @@
    "alignment" : 8,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-18",
+   "referenced_type" : "type-25",
+   "self_type" : "type-29",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
@@ -2510,8 +2510,8 @@
    "alignment" : 8,
    "linker_set_key" : "str_parms *",
    "name" : "str_parms *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-100",
+   "referenced_type" : "type-119",
+   "self_type" : "type-118",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
@@ -2519,8 +2519,8 @@
    "alignment" : 8,
    "linker_set_key" : "str_parms *",
    "name" : "str_parms *",
-   "referenced_type" : "type-51",
-   "self_type" : "type-50",
+   "referenced_type" : "type-154",
+   "self_type" : "type-153",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
@@ -2528,8 +2528,8 @@
    "alignment" : 8,
    "linker_set_key" : "str_parms *",
    "name" : "str_parms *",
-   "referenced_type" : "type-90",
-   "self_type" : "type-89",
+   "referenced_type" : "type-8",
+   "self_type" : "type-7",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
@@ -2537,8 +2537,8 @@
    "alignment" : 8,
    "linker_set_key" : "thread_store_t *",
    "name" : "thread_store_t *",
-   "referenced_type" : "type-31",
-   "self_type" : "type-33",
+   "referenced_type" : "type-44",
+   "self_type" : "type-46",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   },
@@ -2547,7 +2547,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-6",
-   "self_type" : "type-13",
+   "self_type" : "type-24",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/misc.h"
   },
@@ -2555,8 +2555,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long *",
    "name" : "unsigned long *",
-   "referenced_type" : "type-21",
-   "self_type" : "type-23",
+   "referenced_type" : "type-32",
+   "self_type" : "type-34",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2564,8 +2564,8 @@
    "alignment" : 8,
    "linker_set_key" : "void (*)(const char *, const char *, void *)",
    "name" : "void (*)(const char *, const char *, void *)",
-   "referenced_type" : "type-59",
-   "self_type" : "type-62",
+   "referenced_type" : "type-21",
+   "self_type" : "type-22",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
@@ -2573,8 +2573,8 @@
    "alignment" : 8,
    "linker_set_key" : "void (*)(void *)",
    "name" : "void (*)(void *)",
-   "referenced_type" : "type-34",
-   "self_type" : "type-35",
+   "referenced_type" : "type-47",
+   "self_type" : "type-48",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   },
@@ -2582,8 +2582,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
+   "referenced_type" : "type-19",
+   "self_type" : "type-18",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/misc.h"
   },
@@ -2591,8 +2591,8 @@
    "alignment" : 8,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-11",
-   "self_type" : "type-22",
+   "referenced_type" : "type-18",
+   "self_type" : "type-33",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   }
@@ -2614,8 +2614,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-28",
-   "self_type" : "type-27",
+   "referenced_type" : "type-41",
+   "self_type" : "type-40",
    "size" : 2,
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
@@ -2624,8 +2624,8 @@
    "is_const" : true,
    "linker_set_key" : "const cutils_socket_buffer_t",
    "name" : "const cutils_socket_buffer_t",
-   "referenced_type" : "type-24",
-   "self_type" : "type-48",
+   "referenced_type" : "type-35",
+   "self_type" : "type-61",
    "size" : 16,
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
@@ -2634,8 +2634,8 @@
    "is_const" : true,
    "linker_set_key" : "const iovec",
    "name" : "const iovec",
-   "referenced_type" : "type-105",
-   "self_type" : "type-104",
+   "referenced_type" : "type-123",
+   "self_type" : "type-122",
    "size" : 16,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2644,8 +2644,8 @@
    "is_const" : true,
    "linker_set_key" : "const iovec",
    "name" : "const iovec",
-   "referenced_type" : "type-56",
-   "self_type" : "type-55",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 16,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2654,8 +2654,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-14",
-   "self_type" : "type-16",
+   "referenced_type" : "type-25",
+   "self_type" : "type-27",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
@@ -2663,8 +2663,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-12",
-   "self_type" : "type-26",
+   "referenced_type" : "type-19",
+   "self_type" : "type-37",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   }
  ],
@@ -2713,18 +2713,18 @@
    [
     {
      "field_name" : "data",
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-36"
     },
     {
      "field_name" : "length",
      "field_offset" : 64,
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "cutils_socket_buffer_t",
    "name" : "cutils_socket_buffer_t",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
+   "referenced_type" : "type-35",
+   "self_type" : "type-35",
    "size" : 16,
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h",
    "unique_id" : "cutils_socket_buffer_t"
@@ -2735,28 +2735,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-26"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -2767,23 +2767,23 @@
    [
     {
      "field_name" : "lock",
-     "referenced_type" : "type-32"
+     "referenced_type" : "type-45"
     },
     {
      "field_name" : "has_tls",
      "field_offset" : 320,
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "tls",
      "field_offset" : 352,
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-14"
     }
    ],
    "linker_set_key" : "thread_store_t",
    "name" : "thread_store_t",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 48,
    "source_file" : "/system/core/libcutils/include/cutils/threads.h",
    "unique_id" : "thread_store_t"
diff --git a/Q/64/x86_64/source-based/libprocessgroup.so.lsdump b/Q/64/x86_64/source-based/libprocessgroup.so.lsdump
index a289d79..9da0e8b 100644
--- a/Q/64/x86_64/source-based/libprocessgroup.so.lsdump
+++ b/Q/64/x86_64/source-based/libprocessgroup.so.lsdump
@@ -8,8 +8,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
+   "referenced_type" : "type-5",
+   "self_type" : "type-5",
    "size" : 1
   },
   {
@@ -26,20 +26,11 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 4
   },
   {
-   "alignment" : 8,
-   "is_integral" : true,
-   "linker_set_key" : "long",
-   "name" : "long",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
-   "size" : 8
-  },
-  {
    "alignment" : 4,
    "is_integral" : true,
    "is_unsigned" : true,
@@ -48,12 +39,6 @@
    "referenced_type" : "type-4",
    "self_type" : "type-4",
    "size" : 4
-  },
-  {
-   "linker_set_key" : "void",
-   "name" : "void",
-   "referenced_type" : "type-6",
-   "self_type" : "type-6"
   }
  ],
  "elf_functions" :
@@ -74,7 +59,31 @@
    "name" : "SetTaskProfiles"
   },
   {
-   "name" : "UsePerAppMemcg"
+   "name" : "_Z14UsePerAppMemcgv"
+  },
+  {
+   "name" : "_Z16killProcessGroupjii"
+  },
+  {
+   "name" : "_Z18createProcessGroupjib"
+  },
+  {
+   "name" : "_Z20killProcessGroupOncejii"
+  },
+  {
+   "name" : "_Z20setProcessGroupLimitjil"
+  },
+  {
+   "name" : "_Z22removeAllProcessGroupsv"
+  },
+  {
+   "name" : "_Z24setProcessGroupSoftLimitjil"
+  },
+  {
+   "name" : "_Z25setProcessGroupSwappinessjii"
+  },
+  {
+   "name" : "_ZN11TaskProfile21EnableResourceCachingEv"
   },
   {
    "name" : "_ZN12TaskProfiles11GetInstanceEv"
@@ -95,6 +104,9 @@
    "name" : "_ZN15SetCgroupAction18IsAppDependentPathERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
   },
   {
+   "name" : "_ZN15SetCgroupAction21EnableResourceCachingEv"
+  },
+  {
    "name" : "_ZN15SetCgroupActionC1ERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE"
   },
   {
@@ -582,36 +594,15 @@
    "name" : "cpusets_enabled"
   },
   {
-   "name" : "createProcessGroup"
-  },
-  {
    "name" : "get_sched_policy"
   },
   {
    "name" : "get_sched_policy_name"
   },
   {
-   "name" : "killProcessGroup"
-  },
-  {
-   "name" : "killProcessGroupOnce"
-  },
-  {
-   "name" : "removeAllProcessGroups"
-  },
-  {
    "name" : "schedboost_enabled"
   },
   {
-   "name" : "setProcessGroupLimit"
-  },
-  {
-   "name" : "setProcessGroupSoftLimit"
-  },
-  {
-   "name" : "setProcessGroupSwappiness"
-  },
-  {
    "name" : "set_cpuset_policy"
   },
   {
@@ -786,11 +777,11 @@
    ],
    "linker_set_key" : "SchedPolicy",
    "name" : "SchedPolicy",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
+   "referenced_type" : "type-11",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h",
-   "underlying_type" : "type-14",
+   "underlying_type" : "type-12",
    "unique_id" : "SchedPolicy"
   }
  ],
@@ -803,13 +794,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -818,16 +809,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -836,13 +827,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -854,13 +845,17 @@
      "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-17"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-5"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -869,59 +864,38 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-17"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-5"
     }
    ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "UsePerAppMemcg",
-   "linker_set_key" : "UsePerAppMemcg",
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
    "function_name" : "cpusets_enabled",
    "linker_set_key" : "cpusets_enabled",
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
-   "function_name" : "createProcessGroup",
-   "linker_set_key" : "createProcessGroup",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
    "function_name" : "get_sched_policy",
    "linker_set_key" : "get_sched_policy",
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
@@ -930,127 +904,31 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
    "return_type" : "type-1",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
-   "function_name" : "killProcessGroup",
-   "linker_set_key" : "killProcessGroup",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "killProcessGroupOnce",
-   "linker_set_key" : "killProcessGroupOnce",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "removeAllProcessGroups",
-   "linker_set_key" : "removeAllProcessGroups",
-   "return_type" : "type-6",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
    "function_name" : "schedboost_enabled",
    "linker_set_key" : "schedboost_enabled",
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
-   "function_name" : "setProcessGroupLimit",
-   "linker_set_key" : "setProcessGroupLimit",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-5"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "setProcessGroupSoftLimit",
-   "linker_set_key" : "setProcessGroupSoftLimit",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-5"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "setProcessGroupSwappiness",
-   "linker_set_key" : "setProcessGroupSwappiness",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
    "function_name" : "set_cpuset_policy",
    "linker_set_key" : "set_cpuset_policy",
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
@@ -1059,13 +937,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   }
  ],
@@ -1076,8 +954,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-8",
-   "self_type" : "type-10",
+   "referenced_type" : "type-6",
+   "self_type" : "type-8",
    "size" : 8,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
@@ -1085,8 +963,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
    "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
-   "referenced_type" : "type-17",
-   "self_type" : "type-19",
+   "referenced_type" : "type-15",
+   "self_type" : "type-17",
    "size" : 8,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   }
@@ -1097,8 +975,8 @@
    "alignment" : 8,
    "linker_set_key" : "SchedPolicy *",
    "name" : "SchedPolicy *",
-   "referenced_type" : "type-13",
-   "self_type" : "type-15",
+   "referenced_type" : "type-11",
+   "self_type" : "type-13",
    "size" : 8,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
@@ -1115,8 +993,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
+   "referenced_type" : "type-10",
+   "self_type" : "type-9",
    "size" : 8,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   }
@@ -1139,7 +1017,7 @@
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
    "referenced_type" : "type-1",
-   "self_type" : "type-16",
+   "self_type" : "type-14",
    "size" : 8,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
@@ -1148,8 +1026,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-9",
-   "self_type" : "type-8",
+   "referenced_type" : "type-7",
+   "self_type" : "type-6",
    "size" : 24,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
@@ -1158,8 +1036,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
    "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
-   "referenced_type" : "type-18",
-   "self_type" : "type-17",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 24,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   }
diff --git a/Q/64/x86_x86_64/source-based/libcutils.so.lsdump b/Q/64/x86_x86_64/source-based/libcutils.so.lsdump
index 0e8345b..d5b0e1a 100644
--- a/Q/64/x86_x86_64/source-based/libcutils.so.lsdump
+++ b/Q/64/x86_x86_64/source-based/libcutils.so.lsdump
@@ -5,8 +5,8 @@
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-14",
-   "self_type" : "type-19",
+   "referenced_type" : "type-16",
+   "self_type" : "type-28",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   }
  ],
@@ -18,8 +18,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 1
   },
   {
@@ -37,8 +37,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-41",
+   "self_type" : "type-41",
    "size" : 2
   },
   {
@@ -54,8 +54,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
    "size" : 4
   },
   {
@@ -63,8 +63,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 8
   },
   {
@@ -72,8 +72,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-54",
-   "self_type" : "type-54",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 1
   },
   {
@@ -92,8 +92,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 8
   },
   {
@@ -102,15 +102,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16"
+   "referenced_type" : "type-19",
+   "self_type" : "type-19"
   }
  ],
  "elf_functions" :
@@ -539,15 +539,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-18"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-18"
     }
    ],
-   "referenced_type" : "type-45",
-   "return_type" : "type-46",
-   "self_type" : "type-45",
+   "referenced_type" : "type-54",
+   "return_type" : "type-55",
+   "self_type" : "type-54",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -557,18 +557,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-18"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-18"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-18"
     }
    ],
-   "referenced_type" : "type-47",
-   "return_type" : "type-48",
-   "self_type" : "type-47",
+   "referenced_type" : "type-56",
+   "return_type" : "type-57",
+   "self_type" : "type-56",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -578,12 +578,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-18"
     }
    ],
-   "referenced_type" : "type-50",
-   "return_type" : "type-14",
-   "self_type" : "type-50",
+   "referenced_type" : "type-59",
+   "return_type" : "type-16",
+   "self_type" : "type-59",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -599,12 +599,12 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-18"
     }
    ],
-   "referenced_type" : "type-57",
-   "return_type" : "type-16",
-   "self_type" : "type-57",
+   "referenced_type" : "type-22",
+   "return_type" : "type-19",
+   "self_type" : "type-22",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -614,12 +614,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-18"
     }
    ],
-   "referenced_type" : "type-38",
-   "return_type" : "type-16",
-   "self_type" : "type-38",
+   "referenced_type" : "type-47",
+   "return_type" : "type-19",
+   "self_type" : "type-47",
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   }
  ],
@@ -634,7 +634,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/android_get_control_file.h"
   },
   {
@@ -646,7 +646,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -655,16 +655,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-15"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/iosched_policy.h"
   },
   {
@@ -676,13 +676,13 @@
      "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/android_reboot.h"
   },
   {
@@ -691,16 +691,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
      "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/iosched_policy.h"
   },
   {
@@ -715,7 +715,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -724,16 +724,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
    "function_name" : "ashmem_init",
    "linker_set_key" : "ashmem_init",
-   "return_type" : "type-16",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -742,7 +742,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
      "referenced_type" : "type-6"
@@ -751,7 +751,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -760,13 +760,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -775,7 +775,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
      "referenced_type" : "type-6"
@@ -784,7 +784,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -793,10 +793,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/ashmem.h"
   },
   {
@@ -808,10 +808,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
@@ -823,10 +823,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
@@ -838,13 +838,13 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
    "function_name" : "atrace_end_body",
    "linker_set_key" : "atrace_end_body",
-   "return_type" : "type-16",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
@@ -856,10 +856,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
@@ -871,10 +871,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
@@ -883,10 +883,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-24"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
@@ -895,22 +895,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-24"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
    "function_name" : "atrace_setup",
    "linker_set_key" : "atrace_setup",
-   "return_type" : "type-16",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
    "function_name" : "atrace_update_tags",
    "linker_set_key" : "atrace_update_tags",
-   "return_type" : "type-16",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
@@ -925,10 +925,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/config_utils.h"
   },
   {
@@ -955,7 +955,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/config_utils.h"
   },
   {
@@ -967,10 +967,10 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/config_utils.h"
   },
   {
@@ -985,7 +985,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/config_utils.h"
   },
   {
@@ -1018,7 +1018,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/config_utils.h"
   },
   {
@@ -1048,10 +1048,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-49"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1063,7 +1063,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-49"
     },
     {
      "referenced_type" : "type-6"
@@ -1072,7 +1072,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1084,7 +1084,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-49"
     },
     {
      "referenced_type" : "type-6"
@@ -1093,7 +1093,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1105,7 +1105,7 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-49"
     },
     {
      "referenced_type" : "type-6"
@@ -1114,7 +1114,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1126,10 +1126,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-15"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1141,10 +1141,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/fs.h"
   },
   {
@@ -1156,13 +1156,13 @@
      "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-60"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-53"
     }
    ],
-   "return_type" : "type-42",
+   "return_type" : "type-51",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1171,16 +1171,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-51"
     },
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-58"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-18"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1189,10 +1189,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-51"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1201,13 +1201,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-51"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-18"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "type-18",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1216,13 +1216,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-18"
     },
     {
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1231,10 +1231,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-51"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1243,16 +1243,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-51"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-18"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-18"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "type-18",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1261,13 +1261,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-51"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-18"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "type-18",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1276,10 +1276,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-51"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
   {
@@ -1288,10 +1288,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
   {
@@ -1300,13 +1300,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
   {
@@ -1315,16 +1315,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-17"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
   {
@@ -1336,10 +1336,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-26"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "type-18",
    "source_file" : "/system/core/libcutils/include/cutils/misc.h"
   },
   {
@@ -1459,10 +1459,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-22",
+   "return_type" : "type-31",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1471,10 +1471,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1483,13 +1483,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-22",
+   "return_type" : "type-31",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1498,10 +1498,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-31"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1510,16 +1510,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-22",
+   "return_type" : "type-31",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -1531,7 +1531,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/partition_utils.h"
   },
   {
@@ -1543,13 +1543,13 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-50"
     },
     {
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1561,10 +1561,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-20"
     }
    ],
-   "return_type" : "type-54",
+   "return_type" : "type-20",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1576,10 +1576,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1591,10 +1591,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-21"
     }
    ],
-   "return_type" : "type-55",
+   "return_type" : "type-21",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1603,13 +1603,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-23"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-18"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1624,7 +1624,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
   {
@@ -1633,10 +1633,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
   {
@@ -1645,16 +1645,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-34"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-26"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
   {
@@ -1663,13 +1663,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-23",
+   "return_type" : "type-32",
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
   {
@@ -1678,10 +1678,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1690,10 +1690,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1702,13 +1702,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1720,13 +1720,13 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1735,19 +1735,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1759,13 +1759,13 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1774,16 +1774,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1795,13 +1795,13 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1813,19 +1813,19 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-15"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1834,16 +1834,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-62"
     },
     {
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1852,13 +1852,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
   {
@@ -1876,7 +1876,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1891,10 +1891,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1912,7 +1912,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1945,7 +1945,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1957,7 +1957,7 @@
      "referenced_type" : "type-7"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1969,7 +1969,7 @@
      "referenced_type" : "type-7"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -1987,7 +1987,7 @@
      "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2002,10 +2002,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-15"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2020,13 +2020,13 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2041,7 +2041,7 @@
      "referenced_type" : "type-3"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2053,7 +2053,7 @@
      "referenced_type" : "type-7"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-50",
    "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
   },
   {
@@ -2062,16 +2062,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-43"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-26"
     }
    ],
-   "return_type" : "type-34",
+   "return_type" : "type-43",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2080,19 +2080,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-43"
     },
     {
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-26"
     }
    ],
-   "return_type" : "type-34",
+   "return_type" : "type-43",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2104,10 +2104,10 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-26"
     }
    ],
-   "return_type" : "type-34",
+   "return_type" : "type-43",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2128,16 +2128,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-42"
     },
     {
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-50",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2146,13 +2146,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-42"
     },
     {
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-50",
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
   {
@@ -2161,7 +2161,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-42"
     },
     {
      "referenced_type" : "type-6"
@@ -2176,10 +2176,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-37"
+     "referenced_type" : "type-46"
     }
    ],
-   "return_type" : "type-15",
+   "return_type" : "type-18",
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   },
   {
@@ -2188,16 +2188,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-37"
+     "referenced_type" : "type-46"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-18"
     },
     {
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-19",
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   },
   {
@@ -2206,16 +2206,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-18"
     },
     {
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/uevent.h"
   },
   {
@@ -2224,19 +2224,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-18"
     },
     {
      "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-26"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/uevent.h"
   },
   {
@@ -2245,22 +2245,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-18"
     },
     {
      "referenced_type" : "type-6"
     },
     {
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-24"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-26"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/uevent.h"
   },
   {
@@ -2269,13 +2269,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-24"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/uevent.h"
   }
  ],
@@ -2284,19 +2284,19 @@
   {
    "linker_set_key" : "atrace_enabled_tags",
    "name" : "atrace_enabled_tags",
-   "referenced_type" : "type-62",
+   "referenced_type" : "type-25",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
    "linker_set_key" : "atrace_is_ready",
    "name" : "atrace_is_ready",
-   "referenced_type" : "type-93",
+   "referenced_type" : "type-63",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   },
   {
    "linker_set_key" : "atrace_marker_fd",
    "name" : "atrace_marker_fd",
-   "referenced_type" : "type-14",
+   "referenced_type" : "type-16",
    "source_file" : "/system/core/libcutils/include/cutils/trace.h"
   }
  ],
@@ -2307,8 +2307,8 @@
    "alignment" : 4,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-123",
-   "self_type" : "type-122",
+   "referenced_type" : "type-109",
+   "self_type" : "type-108",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2316,8 +2316,8 @@
    "alignment" : 4,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-131",
-   "self_type" : "type-130",
+   "referenced_type" : "type-140",
+   "self_type" : "type-139",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2325,8 +2325,8 @@
    "alignment" : 4,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-43",
-   "self_type" : "type-42",
+   "referenced_type" : "type-52",
+   "self_type" : "type-51",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2334,8 +2334,8 @@
    "alignment" : 4,
    "linker_set_key" : "Hashmap *",
    "name" : "Hashmap *",
-   "referenced_type" : "type-80",
-   "self_type" : "type-79",
+   "referenced_type" : "type-84",
+   "self_type" : "type-83",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2352,8 +2352,8 @@
    "alignment" : 4,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-113",
-   "self_type" : "type-112",
+   "referenced_type" : "type-130",
+   "self_type" : "type-129",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2361,8 +2361,8 @@
    "alignment" : 4,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-129",
-   "self_type" : "type-128",
+   "referenced_type" : "type-33",
+   "self_type" : "type-32",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2370,8 +2370,8 @@
    "alignment" : 4,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-23",
+   "referenced_type" : "type-39",
+   "self_type" : "type-38",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2379,8 +2379,8 @@
    "alignment" : 4,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-30",
-   "self_type" : "type-29",
+   "referenced_type" : "type-74",
+   "self_type" : "type-73",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2388,8 +2388,8 @@
    "alignment" : 4,
    "linker_set_key" : "RecordStream *",
    "name" : "RecordStream *",
-   "referenced_type" : "type-71",
-   "self_type" : "type-70",
+   "referenced_type" : "type-99",
+   "self_type" : "type-98",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   },
@@ -2397,8 +2397,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(void *, void *)",
    "name" : "bool (*)(void *, void *)",
-   "referenced_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "type-54",
+   "self_type" : "type-53",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2406,8 +2406,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(void *, void *, void *)",
    "name" : "bool (*)(void *, void *, void *)",
-   "referenced_type" : "type-47",
-   "self_type" : "type-49",
+   "referenced_type" : "type-56",
+   "self_type" : "type-58",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2416,7 +2416,7 @@
    "linker_set_key" : "char *",
    "name" : "char *",
    "referenced_type" : "type-5",
-   "self_type" : "type-41",
+   "self_type" : "type-50",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/config_utils.h"
   },
@@ -2424,8 +2424,8 @@
    "alignment" : 4,
    "linker_set_key" : "char16_t *",
    "name" : "char16_t *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-34",
+   "referenced_type" : "type-41",
+   "self_type" : "type-43",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
@@ -2451,8 +2451,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-31",
-   "self_type" : "type-33",
+   "referenced_type" : "type-40",
+   "self_type" : "type-42",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
@@ -2460,8 +2460,8 @@
    "alignment" : 4,
    "linker_set_key" : "const cutils_socket_buffer_t *",
    "name" : "const cutils_socket_buffer_t *",
-   "referenced_type" : "type-52",
-   "self_type" : "type-53",
+   "referenced_type" : "type-61",
+   "self_type" : "type-62",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
@@ -2469,8 +2469,8 @@
    "alignment" : 4,
    "linker_set_key" : "const iovec *",
    "name" : "const iovec *",
-   "referenced_type" : "type-102",
-   "self_type" : "type-104",
+   "referenced_type" : "type-13",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2478,8 +2478,8 @@
    "alignment" : 4,
    "linker_set_key" : "const iovec *",
    "name" : "const iovec *",
-   "referenced_type" : "type-90",
-   "self_type" : "type-92",
+   "referenced_type" : "type-150",
+   "self_type" : "type-152",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2487,8 +2487,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-21",
+   "referenced_type" : "type-29",
+   "self_type" : "type-30",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
@@ -2496,8 +2496,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-28",
-   "self_type" : "type-27",
+   "referenced_type" : "type-37",
+   "self_type" : "type-36",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
@@ -2514,8 +2514,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-50",
-   "self_type" : "type-51",
+   "referenced_type" : "type-59",
+   "self_type" : "type-60",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/hashmap.h"
   },
@@ -2523,8 +2523,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/iosched_policy.h"
   },
@@ -2532,8 +2532,8 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-18",
-   "self_type" : "type-22",
+   "referenced_type" : "type-27",
+   "self_type" : "type-31",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
@@ -2541,6 +2541,24 @@
    "alignment" : 4,
    "linker_set_key" : "str_parms *",
    "name" : "str_parms *",
+   "referenced_type" : "type-117",
+   "self_type" : "type-116",
+   "size" : 4,
+   "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "str_parms *",
+   "name" : "str_parms *",
+   "referenced_type" : "type-148",
+   "self_type" : "type-147",
+   "size" : 4,
+   "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "str_parms *",
+   "name" : "str_parms *",
    "referenced_type" : "type-8",
    "self_type" : "type-7",
    "size" : 4,
@@ -2548,28 +2566,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "str_parms *",
-   "name" : "str_parms *",
-   "referenced_type" : "type-88",
-   "self_type" : "type-87",
-   "size" : 4,
-   "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "str_parms *",
-   "name" : "str_parms *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-98",
-   "size" : 4,
-   "source_file" : "/system/core/libcutils/include/cutils/str_parms.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "thread_store_t *",
    "name" : "thread_store_t *",
-   "referenced_type" : "type-35",
-   "self_type" : "type-37",
+   "referenced_type" : "type-44",
+   "self_type" : "type-46",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   },
@@ -2578,7 +2578,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-6",
-   "self_type" : "type-17",
+   "self_type" : "type-26",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/misc.h"
   },
@@ -2586,8 +2586,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(const char *, const char *, void *)",
    "name" : "void (*)(const char *, const char *, void *)",
-   "referenced_type" : "type-57",
-   "self_type" : "type-60",
+   "referenced_type" : "type-22",
+   "self_type" : "type-23",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/properties.h"
   },
@@ -2595,8 +2595,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(void *)",
    "name" : "void (*)(void *)",
-   "referenced_type" : "type-38",
-   "self_type" : "type-39",
+   "referenced_type" : "type-47",
+   "self_type" : "type-48",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/threads.h"
   },
@@ -2604,8 +2604,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-16",
-   "self_type" : "type-15",
+   "referenced_type" : "type-19",
+   "self_type" : "type-18",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/misc.h"
   },
@@ -2613,8 +2613,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-15",
-   "self_type" : "type-25",
+   "referenced_type" : "type-18",
+   "self_type" : "type-34",
    "size" : 4,
    "source_file" : "/system/core/libcutils/include/cutils/record_stream.h"
   }
@@ -2636,8 +2636,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-32",
-   "self_type" : "type-31",
+   "referenced_type" : "type-41",
+   "self_type" : "type-40",
    "size" : 2,
    "source_file" : "/system/core/libcutils/include/cutils/jstring.h"
   },
@@ -2646,8 +2646,8 @@
    "is_const" : true,
    "linker_set_key" : "const cutils_socket_buffer_t",
    "name" : "const cutils_socket_buffer_t",
-   "referenced_type" : "type-26",
-   "self_type" : "type-52",
+   "referenced_type" : "type-35",
+   "self_type" : "type-61",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   },
@@ -2656,8 +2656,8 @@
    "is_const" : true,
    "linker_set_key" : "const iovec",
    "name" : "const iovec",
-   "referenced_type" : "type-103",
-   "self_type" : "type-102",
+   "referenced_type" : "type-14",
+   "self_type" : "type-13",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2666,8 +2666,8 @@
    "is_const" : true,
    "linker_set_key" : "const iovec",
    "name" : "const iovec",
-   "referenced_type" : "type-91",
-   "self_type" : "type-90",
+   "referenced_type" : "type-151",
+   "self_type" : "type-150",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/klog.h"
   },
@@ -2676,8 +2676,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-18",
-   "self_type" : "type-20",
+   "referenced_type" : "type-27",
+   "self_type" : "type-29",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
@@ -2685,8 +2685,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-16",
-   "self_type" : "type-28",
+   "referenced_type" : "type-19",
+   "self_type" : "type-37",
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h"
   }
  ],
@@ -2735,7 +2735,7 @@
    [
     {
      "field_name" : "data",
-     "referenced_type" : "type-27"
+     "referenced_type" : "type-36"
     },
     {
      "field_name" : "length",
@@ -2745,8 +2745,8 @@
    ],
    "linker_set_key" : "cutils_socket_buffer_t",
    "name" : "cutils_socket_buffer_t",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
+   "referenced_type" : "type-35",
+   "self_type" : "type-35",
    "size" : 8,
    "source_file" : "/system/core/libcutils/include/cutils/sockets.h",
    "unique_id" : "cutils_socket_buffer_t"
@@ -2757,28 +2757,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-28"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-18",
-   "self_type" : "type-18",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -2789,23 +2789,23 @@
    [
     {
      "field_name" : "lock",
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-45"
     },
     {
      "field_name" : "has_tls",
      "field_offset" : 32,
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     },
     {
      "field_name" : "tls",
      "field_offset" : 64,
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-16"
     }
    ],
    "linker_set_key" : "thread_store_t",
    "name" : "thread_store_t",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/threads.h",
    "unique_id" : "thread_store_t"
diff --git a/Q/64/x86_x86_64/source-based/libprocessgroup.so.lsdump b/Q/64/x86_x86_64/source-based/libprocessgroup.so.lsdump
index 1b73438..f5753e4 100644
--- a/Q/64/x86_x86_64/source-based/libprocessgroup.so.lsdump
+++ b/Q/64/x86_x86_64/source-based/libprocessgroup.so.lsdump
@@ -8,8 +8,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
+   "referenced_type" : "type-5",
+   "self_type" : "type-5",
    "size" : 1
   },
   {
@@ -26,34 +26,19 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 4
   },
   {
    "alignment" : 4,
    "is_integral" : true,
-   "linker_set_key" : "long long",
-   "name" : "long long",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
-   "size" : 8
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
    "referenced_type" : "type-4",
    "self_type" : "type-4",
    "size" : 4
-  },
-  {
-   "linker_set_key" : "void",
-   "name" : "void",
-   "referenced_type" : "type-6",
-   "self_type" : "type-6"
   }
  ],
  "elf_functions" :
@@ -74,7 +59,31 @@
    "name" : "SetTaskProfiles"
   },
   {
-   "name" : "UsePerAppMemcg"
+   "name" : "_Z14UsePerAppMemcgv"
+  },
+  {
+   "name" : "_Z16killProcessGroupjii"
+  },
+  {
+   "name" : "_Z18createProcessGroupjib"
+  },
+  {
+   "name" : "_Z20killProcessGroupOncejii"
+  },
+  {
+   "name" : "_Z20setProcessGroupLimitjix"
+  },
+  {
+   "name" : "_Z22removeAllProcessGroupsv"
+  },
+  {
+   "name" : "_Z24setProcessGroupSoftLimitjix"
+  },
+  {
+   "name" : "_Z25setProcessGroupSwappinessjii"
+  },
+  {
+   "name" : "_ZN11TaskProfile21EnableResourceCachingEv"
   },
   {
    "name" : "_ZN12TaskProfiles11GetInstanceEv"
@@ -95,6 +104,9 @@
    "name" : "_ZN15SetCgroupAction18IsAppDependentPathERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
   },
   {
+   "name" : "_ZN15SetCgroupAction21EnableResourceCachingEv"
+  },
+  {
    "name" : "_ZN15SetCgroupActionC1ERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE"
   },
   {
@@ -601,36 +613,15 @@
    "name" : "cpusets_enabled"
   },
   {
-   "name" : "createProcessGroup"
-  },
-  {
    "name" : "get_sched_policy"
   },
   {
    "name" : "get_sched_policy_name"
   },
   {
-   "name" : "killProcessGroup"
-  },
-  {
-   "name" : "killProcessGroupOnce"
-  },
-  {
-   "name" : "removeAllProcessGroups"
-  },
-  {
    "name" : "schedboost_enabled"
   },
   {
-   "name" : "setProcessGroupLimit"
-  },
-  {
-   "name" : "setProcessGroupSoftLimit"
-  },
-  {
-   "name" : "setProcessGroupSwappiness"
-  },
-  {
    "name" : "set_cpuset_policy"
   },
   {
@@ -805,11 +796,11 @@
    ],
    "linker_set_key" : "SchedPolicy",
    "name" : "SchedPolicy",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
+   "referenced_type" : "type-11",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h",
-   "underlying_type" : "type-14",
+   "underlying_type" : "type-12",
    "unique_id" : "SchedPolicy"
   }
  ],
@@ -822,13 +813,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -837,16 +828,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -855,13 +846,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-10"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-9"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -873,13 +864,17 @@
      "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-17"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-5"
     }
    ],
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
@@ -888,59 +883,38 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-17"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-5"
     }
    ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "UsePerAppMemcg",
-   "linker_set_key" : "UsePerAppMemcg",
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
   {
    "function_name" : "cpusets_enabled",
    "linker_set_key" : "cpusets_enabled",
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
-   "function_name" : "createProcessGroup",
-   "linker_set_key" : "createProcessGroup",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
    "function_name" : "get_sched_policy",
    "linker_set_key" : "get_sched_policy",
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-13"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
@@ -949,127 +923,31 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
    "return_type" : "type-1",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
-   "function_name" : "killProcessGroup",
-   "linker_set_key" : "killProcessGroup",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "killProcessGroupOnce",
-   "linker_set_key" : "killProcessGroupOnce",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "removeAllProcessGroups",
-   "linker_set_key" : "removeAllProcessGroups",
-   "return_type" : "type-6",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
    "function_name" : "schedboost_enabled",
    "linker_set_key" : "schedboost_enabled",
-   "return_type" : "type-7",
+   "return_type" : "type-5",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
-   "function_name" : "setProcessGroupLimit",
-   "linker_set_key" : "setProcessGroupLimit",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-5"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "setProcessGroupSoftLimit",
-   "linker_set_key" : "setProcessGroupSoftLimit",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-5"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
-   "function_name" : "setProcessGroupSwappiness",
-   "linker_set_key" : "setProcessGroupSwappiness",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
-  },
-  {
    "function_name" : "set_cpuset_policy",
    "linker_set_key" : "set_cpuset_policy",
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
   {
@@ -1078,13 +956,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-12",
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   }
  ],
@@ -1095,8 +973,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-8",
-   "self_type" : "type-10",
+   "referenced_type" : "type-6",
+   "self_type" : "type-8",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
@@ -1104,8 +982,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
    "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > &",
-   "referenced_type" : "type-17",
-   "self_type" : "type-19",
+   "referenced_type" : "type-15",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   }
@@ -1116,8 +994,8 @@
    "alignment" : 4,
    "linker_set_key" : "SchedPolicy *",
    "name" : "SchedPolicy *",
-   "referenced_type" : "type-13",
-   "self_type" : "type-15",
+   "referenced_type" : "type-11",
+   "self_type" : "type-13",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/sched_policy.h"
   },
@@ -1134,8 +1012,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
+   "referenced_type" : "type-10",
+   "self_type" : "type-9",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   }
@@ -1158,7 +1036,7 @@
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
    "referenced_type" : "type-1",
-   "self_type" : "type-16",
+   "self_type" : "type-14",
    "size" : 4,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
@@ -1167,8 +1045,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-9",
-   "self_type" : "type-8",
+   "referenced_type" : "type-7",
+   "self_type" : "type-6",
    "size" : 12,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   },
@@ -1177,8 +1055,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
    "name" : "const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
-   "referenced_type" : "type-18",
-   "self_type" : "type-17",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 12,
    "source_file" : "/system/core/libprocessgroup/include/processgroup/processgroup.h"
   }