libaaudio: update ABI

The ABI changed in the IsochronousClockModel.
This is an internal ABI that is not used outside of AAudio.

Bug: 123643363
Test: compile frameworks/av successfully
Change-Id: I50017fd45c347ec600fc276849a9f2f080f4d0b9
diff --git a/29/32/arm_armv7-a-neon/source-based/libaaudio.so.lsdump b/29/32/arm_armv7-a-neon/source-based/libaaudio.so.lsdump
index 4eef0c6..795eda1 100644
--- a/29/32/arm_armv7-a-neon/source-based/libaaudio.so.lsdump
+++ b/29/32/arm_armv7-a-neon/source-based/libaaudio.so.lsdump
@@ -1582,12 +1582,21 @@
    "name" : "_ZNK6aaudio21IsochronousClockModel21convertTimeToPositionEx"
   },
   {
+   "name" : "_ZNK6aaudio21IsochronousClockModel22getLateTimeOffsetNanosEv"
+  },
+  {
    "name" : "_ZNK6aaudio21IsochronousClockModel26convertDeltaPositionToTimeEx"
   },
   {
    "name" : "_ZNK6aaudio21IsochronousClockModel26convertDeltaTimeToPositionEx"
   },
   {
+   "name" : "_ZNK6aaudio21IsochronousClockModel27convertLatestTimeToPositionEx"
+  },
+  {
+   "name" : "_ZNK6aaudio21IsochronousClockModel27convertPositionToLatestTimeEx"
+  },
+  {
    "name" : "_ZNK6aaudio21IsochronousClockModel4dumpEv"
   },
   {
@@ -5378,7 +5387,7 @@
      "referenced_type" : "type-157"
     },
     {
-     "referenced_type" : "type-725"
+     "referenced_type" : "type-513"
     }
    ],
    "return_type" : "type-4",
@@ -5880,7 +5889,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     },
     {
      "referenced_type" : "type-4"
@@ -5902,7 +5911,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     },
     {
      "referenced_type" : "type-4"
@@ -5933,10 +5942,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     },
     {
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-578"
     }
    ],
    "return_type" : "type-4",
@@ -5949,7 +5958,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-4",
@@ -5962,7 +5971,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     },
     {
      "referenced_type" : "type-4"
@@ -5978,7 +5987,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-4",
@@ -5991,7 +6000,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     },
     {
      "referenced_type" : "type-4"
@@ -6007,7 +6016,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-4",
@@ -6020,7 +6029,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     },
     {
      "referenced_type" : "type-4"
@@ -6036,7 +6045,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-54",
@@ -6049,13 +6058,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     },
     {
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-792"
+     "referenced_type" : "type-580"
     }
    ],
    "return_type" : "type-4",
@@ -6068,7 +6077,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-54",
@@ -6081,7 +6090,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-54",
@@ -6094,7 +6103,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-54",
@@ -6107,7 +6116,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-54",
@@ -6120,7 +6129,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-54",
@@ -6395,7 +6404,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-4",
@@ -6408,10 +6417,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-802"
+     "referenced_type" : "type-590"
     }
    ],
    "return_type" : "type-4",
@@ -6425,10 +6434,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-795"
+     "referenced_type" : "type-583"
     }
    ],
    "return_type" : "type-4",
@@ -6441,7 +6450,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-54",
@@ -6454,7 +6463,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-4",
@@ -6467,10 +6476,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-795"
+     "referenced_type" : "type-583"
     },
     {
      "referenced_type" : "type-4"
@@ -6486,7 +6495,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     },
     {
      "referenced_type" : "type-4"
@@ -6508,7 +6517,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-54",
@@ -6521,7 +6530,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-54",
@@ -6534,7 +6543,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-54",
@@ -6547,7 +6556,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-54",
@@ -6560,7 +6569,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-54",
@@ -6573,10 +6582,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     },
     {
-     "referenced_type" : "type-810"
+     "referenced_type" : "type-598"
     }
    ],
    "return_type" : "type-4",
@@ -6589,7 +6598,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     }
    ],
    "return_type" : "type-54",
@@ -6602,7 +6611,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     },
     {
      "referenced_type" : "type-4"
@@ -6624,10 +6633,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     },
     {
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     },
     {
      "referenced_type" : "type-258"
@@ -6643,7 +6652,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     }
    ],
    "return_type" : "type-54",
@@ -6656,7 +6665,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     }
    ],
    "return_type" : "type-54",
@@ -6669,7 +6678,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     }
    ],
    "return_type" : "type-54",
@@ -6682,7 +6691,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     }
    ],
    "return_type" : "type-54",
@@ -6695,7 +6704,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     }
    ],
    "return_type" : "type-54",
@@ -7120,10 +7129,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-515"
     },
     {
-     "referenced_type" : "type-733"
+     "referenced_type" : "type-521"
     }
    ],
    "return_type" : "type-4",
@@ -7136,7 +7145,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-515"
     }
    ],
    "return_type" : "type-54",
@@ -7149,7 +7158,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-515"
     }
    ],
    "return_type" : "type-54",
@@ -7162,7 +7171,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-515"
     }
    ],
    "return_type" : "type-54",
@@ -7175,7 +7184,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-515"
     }
    ],
    "return_type" : "type-54",
@@ -7188,7 +7197,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-515"
     }
    ],
    "return_type" : "type-54",
@@ -7684,16 +7693,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-740"
+     "referenced_type" : "type-528"
     }
    ],
-   "return_type" : "type-812",
+   "return_type" : "type-600",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
   {
    "function_name" : "android::IAAudioClient::getDefaultImpl",
    "linker_set_key" : "_ZN7android13IAAudioClient14getDefaultImplEv",
-   "return_type" : "type-745",
+   "return_type" : "type-533",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
   {
@@ -7702,7 +7711,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-813"
+     "referenced_type" : "type-601"
     }
    ],
    "return_type" : "type-16",
@@ -7715,7 +7724,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-532"
     }
    ],
    "return_type" : "type-54",
@@ -7728,7 +7737,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-532"
     }
    ],
    "return_type" : "type-54",
@@ -7741,7 +7750,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-532"
     }
    ],
    "return_type" : "type-54",
@@ -7754,7 +7763,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-532"
     }
    ],
    "return_type" : "type-54",
@@ -7767,16 +7776,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-748"
+     "referenced_type" : "type-536"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-751"
+     "referenced_type" : "type-539"
     },
     {
-     "referenced_type" : "type-752"
+     "referenced_type" : "type-540"
     },
     {
      "default_arg" : true,
@@ -7792,16 +7801,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-557"
     }
    ],
-   "return_type" : "type-814",
+   "return_type" : "type-602",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
   {
    "function_name" : "android::IAAudioService::getDefaultImpl",
    "linker_set_key" : "_ZN7android14IAAudioService14getDefaultImplEv",
-   "return_type" : "type-774",
+   "return_type" : "type-562",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
   {
@@ -7810,7 +7819,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-815"
+     "referenced_type" : "type-603"
     }
    ],
    "return_type" : "type-16",
@@ -7823,7 +7832,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-773"
+     "referenced_type" : "type-561"
     }
    ],
    "return_type" : "type-54",
@@ -7836,7 +7845,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-773"
+     "referenced_type" : "type-561"
     }
    ],
    "return_type" : "type-54",
@@ -7849,7 +7858,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-773"
+     "referenced_type" : "type-561"
     }
    ],
    "return_type" : "type-54",
@@ -7862,7 +7871,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-773"
+     "referenced_type" : "type-561"
     }
    ],
    "return_type" : "type-54",
@@ -7875,16 +7884,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-565"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-568"
     },
     {
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-569"
     },
     {
      "default_arg" : true,
@@ -8992,7 +9001,7 @@
      "referenced_type" : "type-156"
     },
     {
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-509"
     }
    ],
    "return_type" : "type-4",
@@ -9084,10 +9093,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-573"
     },
     {
-     "referenced_type" : "type-786"
+     "referenced_type" : "type-574"
     }
    ],
    "return_type" : "type-4",
@@ -9101,7 +9110,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-573"
     }
    ],
    "return_type" : "type-4",
@@ -9153,6 +9162,20 @@
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
   },
   {
+   "access" : "private",
+   "function_name" : "aaudio::IsochronousClockModel::getLateTimeOffsetNanos",
+   "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel22getLateTimeOffsetNanosEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-193"
+    }
+   ],
+   "return_type" : "type-4",
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
+  },
+  {
    "function_name" : "aaudio::IsochronousClockModel::convertDeltaPositionToTime",
    "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel26convertDeltaPositionToTimeEx",
    "parameters" :
@@ -9185,6 +9208,38 @@
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
   },
   {
+   "function_name" : "aaudio::IsochronousClockModel::convertLatestTimeToPosition",
+   "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel27convertLatestTimeToPositionEx",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-193"
+    },
+    {
+     "referenced_type" : "type-8"
+    }
+   ],
+   "return_type" : "type-8",
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
+  },
+  {
+   "function_name" : "aaudio::IsochronousClockModel::convertPositionToLatestTime",
+   "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel27convertPositionToLatestTimeEx",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-193"
+    },
+    {
+     "referenced_type" : "type-8"
+    }
+   ],
+   "return_type" : "type-8",
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
+  },
+  {
    "function_name" : "aaudio::IsochronousClockModel::dump",
    "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel4dumpEv",
    "parameters" :
@@ -9243,10 +9298,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-797"
+     "referenced_type" : "type-585"
     },
     {
-     "referenced_type" : "type-798"
+     "referenced_type" : "type-586"
     }
    ],
    "return_type" : "type-4",
@@ -9260,7 +9315,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-797"
+     "referenced_type" : "type-585"
     }
    ],
    "return_type" : "type-4",
@@ -9273,10 +9328,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-805"
+     "referenced_type" : "type-593"
     },
     {
-     "referenced_type" : "type-806"
+     "referenced_type" : "type-594"
     }
    ],
    "return_type" : "type-4",
@@ -9290,7 +9345,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-805"
+     "referenced_type" : "type-593"
     }
    ],
    "return_type" : "type-4",
@@ -9333,10 +9388,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-516"
     },
     {
-     "referenced_type" : "type-729"
+     "referenced_type" : "type-517"
     }
    ],
    "return_type" : "type-4",
@@ -9349,10 +9404,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-743"
+     "referenced_type" : "type-531"
     }
    ],
-   "return_type" : "type-741",
+   "return_type" : "type-529",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
   {
@@ -9362,10 +9417,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-772"
+     "referenced_type" : "type-560"
     }
    ],
-   "return_type" : "type-770",
+   "return_type" : "type-558",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
   {
@@ -9394,16 +9449,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-748"
+     "referenced_type" : "type-536"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-751"
+     "referenced_type" : "type-539"
     },
     {
-     "referenced_type" : "type-752"
+     "referenced_type" : "type-540"
     },
     {
      "default_arg" : true,
@@ -9420,16 +9475,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-565"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-568"
     },
     {
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-569"
     },
     {
      "default_arg" : true,
@@ -9446,10 +9501,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-515"
     },
     {
-     "referenced_type" : "type-733"
+     "referenced_type" : "type-521"
     }
    ],
    "return_type" : "type-4",
@@ -9462,10 +9517,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-516"
     },
     {
-     "referenced_type" : "type-729"
+     "referenced_type" : "type-517"
     }
    ],
    "return_type" : "type-4",
@@ -9615,8 +9670,8 @@
    "alignment" : 4,
    "linker_set_key" : "const aaudio::AudioStreamBuilder &",
    "name" : "const aaudio::AudioStreamBuilder &",
-   "referenced_type" : "type-685",
-   "self_type" : "type-687",
+   "referenced_type" : "type-774",
+   "self_type" : "type-776",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
@@ -9768,8 +9823,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AudioClient &",
    "name" : "const android::AudioClient &",
-   "referenced_type" : "type-581",
-   "self_type" : "type-583",
+   "referenced_type" : "type-547",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9777,8 +9832,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AudioClient &",
    "name" : "const android::AudioClient &",
-   "referenced_type" : "type-656",
-   "self_type" : "type-658",
+   "referenced_type" : "type-670",
+   "self_type" : "type-672",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AudioClient &",
+   "name" : "const android::AudioClient &",
+   "referenced_type" : "type-745",
+   "self_type" : "type-747",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
@@ -9786,17 +9850,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AudioClient &",
    "name" : "const android::AudioClient &",
-   "referenced_type" : "type-715",
-   "self_type" : "type-717",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AudioClient &",
-   "name" : "const android::AudioClient &",
-   "referenced_type" : "type-759",
-   "self_type" : "type-761",
+   "referenced_type" : "type-804",
+   "self_type" : "type-806",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9859,7 +9914,7 @@
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
    "referenced_type" : "type-1495",
-   "self_type" : "type-1497",
+   "self_type" : "type-1498",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -9876,8 +9931,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-749",
-   "self_type" : "type-751",
+   "referenced_type" : "type-537",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -9885,8 +9940,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-778",
-   "self_type" : "type-780",
+   "referenced_type" : "type-566",
+   "self_type" : "type-568",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -9931,7 +9986,7 @@
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
    "referenced_type" : "type-1481",
-   "self_type" : "type-1486",
+   "self_type" : "type-1487",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -9948,8 +10003,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-736",
-   "self_type" : "type-741",
+   "referenced_type" : "type-524",
+   "self_type" : "type-529",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -9957,8 +10012,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-765",
-   "self_type" : "type-770",
+   "referenced_type" : "type-553",
+   "self_type" : "type-558",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -10020,19 +10075,19 @@
    "alignment" : 4,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "referenced_type" : "type-694",
-   "self_type" : "type-696",
+   "referenced_type" : "type-581",
+   "self_type" : "type-583",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "referenced_type" : "type-793",
-   "self_type" : "type-795",
+   "referenced_type" : "type-783",
+   "self_type" : "type-785",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
   {
    "alignment" : 4,
@@ -10056,7 +10111,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-1059",
+   "referenced_type" : "type-1061",
    "self_type" : "type-1063",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
@@ -10083,7 +10138,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-1367",
+   "referenced_type" : "type-1369",
    "self_type" : "type-1371",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
@@ -10155,8 +10210,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-578",
-   "self_type" : "type-580",
+   "referenced_type" : "type-544",
+   "self_type" : "type-546",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10164,8 +10219,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-710",
-   "self_type" : "type-712",
+   "referenced_type" : "type-667",
+   "self_type" : "type-669",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10173,8 +10228,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-754",
-   "self_type" : "type-758",
+   "referenced_type" : "type-799",
+   "self_type" : "type-801",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10245,8 +10300,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IBinder> &",
    "name" : "const android::sp<android::IBinder> &",
-   "referenced_type" : "type-738",
-   "self_type" : "type-740",
+   "referenced_type" : "type-526",
+   "self_type" : "type-528",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -10254,8 +10309,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IBinder> &",
    "name" : "const android::sp<android::IBinder> &",
-   "referenced_type" : "type-767",
-   "self_type" : "type-769",
+   "referenced_type" : "type-555",
+   "self_type" : "type-557",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -10371,8 +10426,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-587",
-   "self_type" : "type-589",
+   "referenced_type" : "type-550",
+   "self_type" : "type-552",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10380,8 +10435,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-718",
-   "self_type" : "type-720",
+   "referenced_type" : "type-676",
+   "self_type" : "type-678",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10389,8 +10444,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-762",
-   "self_type" : "type-764",
+   "referenced_type" : "type-807",
+   "self_type" : "type-809",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10434,8 +10489,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> > &",
    "name" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> > &",
-   "referenced_type" : "type-746",
-   "self_type" : "type-745",
+   "referenced_type" : "type-534",
+   "self_type" : "type-533",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -10470,8 +10525,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> > &",
    "name" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> > &",
-   "referenced_type" : "type-775",
-   "self_type" : "type-774",
+   "referenced_type" : "type-563",
+   "self_type" : "type-562",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -10545,8 +10600,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamBuilderStruct *",
    "name" : "AAudioStreamBuilderStruct *",
-   "referenced_type" : "type-604",
-   "self_type" : "type-603",
+   "referenced_type" : "type-693",
+   "self_type" : "type-692",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10608,8 +10663,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamBuilderStruct **",
    "name" : "AAudioStreamBuilderStruct **",
-   "referenced_type" : "type-603",
-   "self_type" : "type-607",
+   "referenced_type" : "type-692",
+   "self_type" : "type-696",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10626,8 +10681,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-1062",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-1060",
+   "self_type" : "type-1059",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10707,8 +10762,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1367",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10968,15 +11023,6 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-513",
-   "self_type" : "type-512",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
    "referenced_type" : "type-52",
    "self_type" : "type-51",
    "size" : 4,
@@ -10986,8 +11032,17 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
+   "referenced_type" : "type-543",
+   "self_type" : "type-542",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-687",
+   "self_type" : "type-686",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10995,8 +11050,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-602",
-   "self_type" : "type-601",
+   "referenced_type" : "type-691",
+   "self_type" : "type-690",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -11004,8 +11059,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-613",
+   "referenced_type" : "type-703",
+   "self_type" : "type-702",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -11013,8 +11068,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-624",
-   "self_type" : "type-623",
+   "referenced_type" : "type-713",
+   "self_type" : "type-712",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -11022,8 +11077,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-631",
-   "self_type" : "type-630",
+   "referenced_type" : "type-720",
+   "self_type" : "type-719",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -11031,8 +11086,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-670",
-   "self_type" : "type-669",
+   "referenced_type" : "type-759",
+   "self_type" : "type-758",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -11040,8 +11095,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-678",
-   "self_type" : "type-677",
+   "referenced_type" : "type-767",
+   "self_type" : "type-766",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -11049,8 +11104,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-683",
-   "self_type" : "type-682",
+   "referenced_type" : "type-772",
+   "self_type" : "type-771",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -11058,8 +11113,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-757",
-   "self_type" : "type-756",
+   "referenced_type" : "type-814",
+   "self_type" : "type-813",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -11184,8 +11239,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct **",
    "name" : "AAudioStreamStruct **",
-   "referenced_type" : "type-597",
-   "self_type" : "type-600",
+   "referenced_type" : "type-686",
+   "self_type" : "type-689",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -11311,7 +11366,7 @@
    "linker_set_key" : "aaudio::AAudioStreamConfiguration *",
    "name" : "aaudio::AAudioStreamConfiguration *",
    "referenced_type" : "type-150",
-   "self_type" : "type-727",
+   "self_type" : "type-515",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -11473,7 +11528,7 @@
    "linker_set_key" : "aaudio::RingBufferDescriptor_s *",
    "name" : "aaudio::RingBufferDescriptor_s *",
    "referenced_type" : "type-40",
-   "self_type" : "type-792",
+   "self_type" : "type-580",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11482,7 +11537,7 @@
    "linker_set_key" : "aaudio::RingBufferParcelable *",
    "name" : "aaudio::RingBufferParcelable *",
    "referenced_type" : "type-29",
-   "self_type" : "type-783",
+   "self_type" : "type-571",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11491,7 +11546,7 @@
    "linker_set_key" : "aaudio::SharedMemoryParcelable *",
    "name" : "aaudio::SharedMemoryParcelable *",
    "referenced_type" : "type-35",
-   "self_type" : "type-791",
+   "self_type" : "type-579",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11500,7 +11555,7 @@
    "linker_set_key" : "aaudio::SharedRegionParcelable *",
    "name" : "aaudio::SharedRegionParcelable *",
    "referenced_type" : "type-30",
-   "self_type" : "type-803",
+   "self_type" : "type-591",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -11509,7 +11564,7 @@
    "linker_set_key" : "android::BnAAudioClient *",
    "name" : "android::BnAAudioClient *",
    "referenced_type" : "type-165",
-   "self_type" : "type-748",
+   "self_type" : "type-536",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -11518,7 +11573,7 @@
    "linker_set_key" : "android::BnAAudioService *",
    "name" : "android::BnAAudioService *",
    "referenced_type" : "type-170",
-   "self_type" : "type-777",
+   "self_type" : "type-565",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -11571,8 +11626,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ExtendedTimestamp *",
    "name" : "android::ExtendedTimestamp *",
-   "referenced_type" : "type-620",
-   "self_type" : "type-619",
+   "referenced_type" : "type-709",
+   "self_type" : "type-708",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -11626,7 +11681,7 @@
    "linker_set_key" : "android::IAAudioClient *",
    "name" : "android::IAAudioClient *",
    "referenced_type" : "type-161",
-   "self_type" : "type-744",
+   "self_type" : "type-532",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -11635,7 +11690,7 @@
    "linker_set_key" : "android::IAAudioService *",
    "name" : "android::IAAudioService *",
    "referenced_type" : "type-168",
-   "self_type" : "type-773",
+   "self_type" : "type-561",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -11868,17 +11923,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-700",
-   "self_type" : "type-699",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel *",
-   "name" : "android::Parcel *",
-   "referenced_type" : "type-722",
-   "self_type" : "type-721",
+   "referenced_type" : "type-510",
+   "self_type" : "type-509",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -11886,8 +11932,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-730",
-   "self_type" : "type-729",
+   "referenced_type" : "type-518",
+   "self_type" : "type-517",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -11895,8 +11941,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-753",
-   "self_type" : "type-752",
+   "referenced_type" : "type-541",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -11904,8 +11950,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-782",
-   "self_type" : "type-781",
+   "referenced_type" : "type-570",
+   "self_type" : "type-569",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -11913,8 +11959,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-787",
-   "self_type" : "type-786",
+   "referenced_type" : "type-575",
+   "self_type" : "type-574",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11922,8 +11968,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-799",
-   "self_type" : "type-798",
+   "referenced_type" : "type-587",
+   "self_type" : "type-586",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -11931,13 +11977,22 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-807",
-   "self_type" : "type-806",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::Parcel *",
+   "name" : "android::Parcel *",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::WrappingBuffer *",
    "name" : "android::WrappingBuffer *",
    "referenced_type" : "type-205",
@@ -11977,7 +12032,7 @@
    "linker_set_key" : "const aaudio::AAudioStreamConfiguration *",
    "name" : "const aaudio::AAudioStreamConfiguration *",
    "referenced_type" : "type-159",
-   "self_type" : "type-728",
+   "self_type" : "type-516",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -12102,8 +12157,8 @@
    "alignment" : 4,
    "linker_set_key" : "const aaudio::RingBufferParcelable *",
    "name" : "const aaudio::RingBufferParcelable *",
-   "referenced_type" : "type-784",
-   "self_type" : "type-785",
+   "referenced_type" : "type-572",
+   "self_type" : "type-573",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -12111,8 +12166,8 @@
    "alignment" : 4,
    "linker_set_key" : "const aaudio::SharedMemoryParcelable *",
    "name" : "const aaudio::SharedMemoryParcelable *",
-   "referenced_type" : "type-796",
-   "self_type" : "type-797",
+   "referenced_type" : "type-584",
+   "self_type" : "type-585",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -12120,8 +12175,8 @@
    "alignment" : 4,
    "linker_set_key" : "const aaudio::SharedRegionParcelable *",
    "name" : "const aaudio::SharedRegionParcelable *",
-   "referenced_type" : "type-804",
-   "self_type" : "type-805",
+   "referenced_type" : "type-592",
+   "self_type" : "type-593",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -12138,8 +12193,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IAAudioClient *",
    "name" : "const android::IAAudioClient *",
-   "referenced_type" : "type-742",
-   "self_type" : "type-743",
+   "referenced_type" : "type-530",
+   "self_type" : "type-531",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12147,8 +12202,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IAAudioService *",
    "name" : "const android::IAAudioService *",
-   "referenced_type" : "type-771",
-   "self_type" : "type-772",
+   "referenced_type" : "type-559",
+   "self_type" : "type-560",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -12327,17 +12382,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-701",
-   "self_type" : "type-704",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Parcel *",
-   "name" : "const android::Parcel *",
-   "referenced_type" : "type-723",
-   "self_type" : "type-725",
+   "referenced_type" : "type-511",
+   "self_type" : "type-513",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -12345,8 +12391,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-731",
-   "self_type" : "type-733",
+   "referenced_type" : "type-519",
+   "self_type" : "type-521",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -12354,8 +12400,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-788",
-   "self_type" : "type-790",
+   "referenced_type" : "type-576",
+   "self_type" : "type-578",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -12363,8 +12409,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-800",
-   "self_type" : "type-802",
+   "referenced_type" : "type-588",
+   "self_type" : "type-590",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -12372,13 +12418,22 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-808",
-   "self_type" : "type-810",
+   "referenced_type" : "type-596",
+   "self_type" : "type-598",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::Parcel *",
+   "name" : "const android::Parcel *",
+   "referenced_type" : "type-790",
+   "self_type" : "type-793",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
    "referenced_type" : "type-209",
@@ -12651,8 +12706,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::atomic<long long> *",
    "name" : "std::atomic<long long> *",
-   "referenced_type" : "type-639",
-   "self_type" : "type-638",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/fifo/FifoControllerIndirect.h"
   },
@@ -12850,8 +12905,8 @@
    "is_const" : true,
    "linker_set_key" : "const aaudio::AudioStreamBuilder",
    "name" : "const aaudio::AudioStreamBuilder",
-   "referenced_type" : "type-686",
-   "self_type" : "type-685",
+   "referenced_type" : "type-775",
+   "self_type" : "type-774",
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
   {
@@ -12869,7 +12924,7 @@
    "name" : "const aaudio::AudioStreamInternal",
    "referenced_type" : "type-6",
    "self_type" : "type-65",
-   "size" : 1200,
+   "size" : 1208,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
   {
@@ -12879,7 +12934,7 @@
    "name" : "const aaudio::AudioStreamInternalCapture",
    "referenced_type" : "type-69",
    "self_type" : "type-70",
-   "size" : 1208,
+   "size" : 1216,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalCapture.h"
   },
   {
@@ -12889,7 +12944,7 @@
    "name" : "const aaudio::AudioStreamInternalPlay",
    "referenced_type" : "type-113",
    "self_type" : "type-114",
-   "size" : 1232,
+   "size" : 1240,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
   {
@@ -12929,7 +12984,7 @@
    "name" : "const aaudio::IsochronousClockModel",
    "referenced_type" : "type-7",
    "self_type" : "type-192",
-   "size" : 40,
+   "size" : 48,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
   },
   {
@@ -12938,7 +12993,7 @@
    "linker_set_key" : "const aaudio::RingBufferParcelable",
    "name" : "const aaudio::RingBufferParcelable",
    "referenced_type" : "type-29",
-   "self_type" : "type-784",
+   "self_type" : "type-572",
    "size" : 68,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -12948,7 +13003,7 @@
    "linker_set_key" : "const aaudio::SharedMemoryParcelable",
    "name" : "const aaudio::SharedMemoryParcelable",
    "referenced_type" : "type-35",
-   "self_type" : "type-796",
+   "self_type" : "type-584",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -12958,7 +13013,7 @@
    "linker_set_key" : "const aaudio::SharedRegionParcelable",
    "name" : "const aaudio::SharedRegionParcelable",
    "referenced_type" : "type-30",
-   "self_type" : "type-804",
+   "self_type" : "type-592",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -13117,8 +13172,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-582",
-   "self_type" : "type-581",
+   "referenced_type" : "type-548",
+   "self_type" : "type-547",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -13127,8 +13182,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-657",
-   "self_type" : "type-656",
+   "referenced_type" : "type-671",
+   "self_type" : "type-670",
+   "size" : 20,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::AudioClient",
+   "name" : "const android::AudioClient",
+   "referenced_type" : "type-746",
+   "self_type" : "type-745",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
@@ -13137,18 +13202,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-716",
-   "self_type" : "type-715",
-   "size" : 20,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::AudioClient",
-   "name" : "const android::AudioClient",
-   "referenced_type" : "type-760",
-   "self_type" : "type-759",
+   "referenced_type" : "type-805",
+   "self_type" : "type-804",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -13188,7 +13243,7 @@
    "linker_set_key" : "const android::IAAudioClient",
    "name" : "const android::IAAudioClient",
    "referenced_type" : "type-161",
-   "self_type" : "type-742",
+   "self_type" : "type-530",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13198,7 +13253,7 @@
    "linker_set_key" : "const android::IAAudioService",
    "name" : "const android::IAAudioService",
    "referenced_type" : "type-168",
-   "self_type" : "type-771",
+   "self_type" : "type-559",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -13457,18 +13512,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-702",
-   "self_type" : "type-701",
-   "size" : 60,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Parcel",
-   "name" : "const android::Parcel",
-   "referenced_type" : "type-724",
-   "self_type" : "type-723",
+   "referenced_type" : "type-512",
+   "self_type" : "type-511",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -13477,8 +13522,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-732",
-   "self_type" : "type-731",
+   "referenced_type" : "type-520",
+   "self_type" : "type-519",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -13487,8 +13532,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-750",
-   "self_type" : "type-749",
+   "referenced_type" : "type-538",
+   "self_type" : "type-537",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13497,8 +13542,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-779",
-   "self_type" : "type-778",
+   "referenced_type" : "type-567",
+   "self_type" : "type-566",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -13507,8 +13552,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-789",
-   "self_type" : "type-788",
+   "referenced_type" : "type-577",
+   "self_type" : "type-576",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -13517,8 +13562,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-801",
-   "self_type" : "type-800",
+   "referenced_type" : "type-589",
+   "self_type" : "type-588",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -13527,14 +13572,24 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-809",
-   "self_type" : "type-808",
+   "referenced_type" : "type-597",
+   "self_type" : "type-596",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::Parcel",
+   "name" : "const android::Parcel",
+   "referenced_type" : "type-791",
+   "self_type" : "type-790",
+   "size" : 60,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
    "referenced_type" : "type-1012",
@@ -13827,8 +13882,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-575",
-   "self_type" : "type-574",
+   "referenced_type" : "type-525",
+   "self_type" : "type-524",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13837,8 +13892,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-609",
-   "self_type" : "type-608",
+   "referenced_type" : "type-554",
+   "self_type" : "type-553",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13847,8 +13902,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-665",
-   "self_type" : "type-664",
+   "referenced_type" : "type-664",
+   "self_type" : "type-663",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13857,8 +13912,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-674",
-   "self_type" : "type-673",
+   "referenced_type" : "type-698",
+   "self_type" : "type-697",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13867,8 +13922,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-690",
-   "self_type" : "type-689",
+   "referenced_type" : "type-754",
+   "self_type" : "type-753",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13877,8 +13932,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-707",
-   "self_type" : "type-706",
+   "referenced_type" : "type-763",
+   "self_type" : "type-762",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13887,8 +13942,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-779",
+   "self_type" : "type-778",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13897,8 +13952,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
+   "referenced_type" : "type-796",
+   "self_type" : "type-795",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -14027,20 +14082,20 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-695",
-   "self_type" : "type-694",
+   "referenced_type" : "type-582",
+   "self_type" : "type-581",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-794",
-   "self_type" : "type-793",
+   "referenced_type" : "type-784",
+   "self_type" : "type-783",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
   {
    "alignment" : 4,
@@ -14437,8 +14492,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-511",
-   "self_type" : "type-510",
+   "referenced_type" : "type-523",
+   "self_type" : "type-522",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14447,8 +14502,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-585",
-   "self_type" : "type-584",
+   "referenced_type" : "type-674",
+   "self_type" : "type-673",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14457,8 +14512,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-606",
-   "self_type" : "type-605",
+   "referenced_type" : "type-695",
+   "self_type" : "type-694",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14467,8 +14522,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-612",
-   "self_type" : "type-611",
+   "referenced_type" : "type-701",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14477,8 +14532,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
+   "referenced_type" : "type-711",
+   "self_type" : "type-710",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14487,8 +14542,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-629",
-   "self_type" : "type-628",
+   "referenced_type" : "type-718",
+   "self_type" : "type-717",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14497,8 +14552,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-668",
-   "self_type" : "type-667",
+   "referenced_type" : "type-757",
+   "self_type" : "type-756",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14507,8 +14562,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-676",
-   "self_type" : "type-675",
+   "referenced_type" : "type-765",
+   "self_type" : "type-764",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14517,8 +14572,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-680",
-   "self_type" : "type-679",
+   "referenced_type" : "type-769",
+   "self_type" : "type-768",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14527,8 +14582,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-735",
-   "self_type" : "type-734",
+   "referenced_type" : "type-812",
+   "self_type" : "type-811",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14817,8 +14872,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-644",
+   "self_type" : "type-643",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -14827,8 +14882,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-617",
-   "self_type" : "type-616",
+   "referenced_type" : "type-706",
+   "self_type" : "type-705",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -14837,8 +14892,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-626",
-   "self_type" : "type-625",
+   "referenced_type" : "type-715",
+   "self_type" : "type-714",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -14847,8 +14902,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-634",
-   "self_type" : "type-633",
+   "referenced_type" : "type-723",
+   "self_type" : "type-722",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -14907,8 +14962,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioClient>",
    "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-1060",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-1062",
+   "self_type" : "type-1061",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -14935,8 +14990,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioClient>",
    "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-1368",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1369",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -15003,30 +15058,30 @@
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::IAAudioClient>",
-   "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-579",
-   "self_type" : "type-578",
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioClient>",
    "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-711",
-   "self_type" : "type-710",
+   "referenced_type" : "type-545",
+   "self_type" : "type-544",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IAAudioClient>",
+   "name" : "const android::sp<android::IAAudioClient>",
+   "referenced_type" : "type-668",
+   "self_type" : "type-667",
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioClient>",
    "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-755",
-   "self_type" : "type-754",
+   "referenced_type" : "type-800",
+   "self_type" : "type-799",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -15063,8 +15118,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioService>",
    "name" : "const android::sp<android::IAAudioService>",
-   "referenced_type" : "type-1454",
-   "self_type" : "type-1453",
+   "referenced_type" : "type-1455",
+   "self_type" : "type-1454",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -15083,8 +15138,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioService>",
    "name" : "const android::sp<android::IAAudioService>",
-   "referenced_type" : "type-709",
-   "self_type" : "type-708",
+   "referenced_type" : "type-798",
+   "self_type" : "type-797",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -15153,8 +15208,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IBinder>",
    "name" : "const android::sp<android::IBinder>",
-   "referenced_type" : "type-739",
-   "self_type" : "type-738",
+   "referenced_type" : "type-527",
+   "self_type" : "type-526",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -15163,8 +15218,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IBinder>",
    "name" : "const android::sp<android::IBinder>",
-   "referenced_type" : "type-768",
-   "self_type" : "type-767",
+   "referenced_type" : "type-556",
+   "self_type" : "type-555",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -15268,24 +15323,24 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-588",
-   "self_type" : "type-587",
+   "referenced_type" : "type-551",
+   "self_type" : "type-550",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-719",
-   "self_type" : "type-718",
+   "referenced_type" : "type-677",
+   "self_type" : "type-676",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-763",
-   "self_type" : "type-762",
+   "referenced_type" : "type-808",
+   "self_type" : "type-807",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
@@ -15401,8 +15456,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> >",
    "name" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> >",
-   "referenced_type" : "type-747",
-   "self_type" : "type-746",
+   "referenced_type" : "type-535",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -15441,8 +15496,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> >",
    "name" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> >",
-   "referenced_type" : "type-776",
-   "self_type" : "type-775",
+   "referenced_type" : "type-564",
+   "self_type" : "type-563",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -17378,109 +17433,109 @@
     {
      "access" : "protected",
      "field_name" : "mAudioEndpoint",
-     "field_offset" : 1408,
+     "field_offset" : 1472,
      "referenced_type" : "type-10"
     },
     {
      "access" : "protected",
      "field_name" : "mServiceStreamHandle",
-     "field_offset" : 1664,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mFramesPerBurst",
-     "field_offset" : 1696,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mXRunCount",
      "field_offset" : 1728,
      "referenced_type" : "type-4"
     },
     {
      "access" : "protected",
-     "field_name" : "mFramesOffsetFromService",
+     "field_name" : "mFramesPerBurst",
+     "field_offset" : 1760,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mXRunCount",
      "field_offset" : 1792,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mFramesOffsetFromService",
+     "field_offset" : 1856,
      "referenced_type" : "type-8"
     },
     {
      "access" : "protected",
      "field_name" : "mCallbackBuffer",
-     "field_offset" : 1856,
+     "field_offset" : 1920,
      "referenced_type" : "type-14"
     },
     {
      "access" : "protected",
      "field_name" : "mCallbackFrames",
-     "field_offset" : 1888,
+     "field_offset" : 1952,
      "referenced_type" : "type-4"
     },
     {
      "access" : "protected",
      "field_name" : "mInService",
-     "field_offset" : 1920,
+     "field_offset" : 1984,
      "referenced_type" : "type-16"
     },
     {
      "access" : "protected",
      "field_name" : "mServiceInterface",
-     "field_offset" : 1952,
+     "field_offset" : 2016,
      "referenced_type" : "type-18"
     },
     {
      "access" : "protected",
      "field_name" : "mAtomicInternalTimestamp",
-     "field_offset" : 1984,
+     "field_offset" : 2048,
      "referenced_type" : "type-20"
     },
     {
      "access" : "protected",
      "field_name" : "mNeedCatchUp",
-     "field_offset" : 2304,
+     "field_offset" : 2368,
      "referenced_type" : "type-24"
     },
     {
      "access" : "protected",
      "field_name" : "mStreamVolume",
-     "field_offset" : 2368,
+     "field_offset" : 2432,
      "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mWakeupDelayNanos",
-     "field_offset" : 2400,
+     "field_offset" : 2464,
      "referenced_type" : "type-13"
     },
     {
      "access" : "private",
      "field_name" : "mMinimumSleepNanos",
-     "field_offset" : 2432,
+     "field_offset" : 2496,
      "referenced_type" : "type-13"
     },
     {
      "access" : "private",
      "field_name" : "mEndPointParcelable",
-     "field_offset" : 2464,
+     "field_offset" : 2528,
      "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mEndpointDescriptor",
-     "field_offset" : 8800,
+     "field_offset" : 8864,
      "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mServiceLatencyNanos",
-     "field_offset" : 9472,
+     "field_offset" : 9536,
      "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mDeviceChannelCount",
-     "field_offset" : 9536,
+     "field_offset" : 9600,
      "referenced_type" : "type-4"
     }
    ],
@@ -17489,7 +17544,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-6",
    "self_type" : "type-6",
-   "size" : 1200,
+   "size" : 1208,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h",
    "unique_id" : "_ZTSN6aaudio19AudioStreamInternalE",
    "vtable_components" :
@@ -17626,7 +17681,7 @@
     {
      "access" : "private",
      "field_name" : "mLastFramesWritten",
-     "field_offset" : 9600,
+     "field_offset" : 9664,
      "referenced_type" : "type-8"
     }
    ],
@@ -17635,7 +17690,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-69",
    "self_type" : "type-69",
-   "size" : 1208,
+   "size" : 1216,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalCapture.h",
    "unique_id" : "_ZTSN6aaudio26AudioStreamInternalCaptureE",
    "vtable_components" :
@@ -17766,13 +17821,13 @@
     {
      "access" : "private",
      "field_name" : "mLastFramesRead",
-     "field_offset" : 9600,
+     "field_offset" : 9664,
      "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mFlowGraph",
-     "field_offset" : 9664,
+     "field_offset" : 9728,
      "referenced_type" : "type-106"
     }
    ],
@@ -17781,7 +17836,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-113",
    "self_type" : "type-113",
-   "size" : 1232,
+   "size" : 1240,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h",
    "unique_id" : "_ZTSN6aaudio23AudioStreamInternalPlayE",
    "vtable_components" :
@@ -18578,15 +18633,27 @@
     },
     {
      "access" : "private",
-     "field_name" : "mMaxLatenessInNanos",
+     "field_name" : "mBurstPeriodNanos",
      "field_offset" : 256,
      "referenced_type" : "type-4"
     },
     {
      "access" : "private",
-     "field_name" : "mState",
+     "field_name" : "mMaxMeasuredLatenessNanos",
      "field_offset" : 288,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mState",
+     "field_offset" : 320,
      "referenced_type" : "type-9"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampCount",
+     "field_offset" : 352,
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "aaudio::IsochronousClockModel",
@@ -18594,7 +18661,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-7",
    "self_type" : "type-7",
-   "size" : 40,
+   "size" : 48,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h",
    "unique_id" : "_ZTSN6aaudio21IsochronousClockModelE",
    "vtable_components" :
diff --git a/29/32/x86/source-based/libaaudio.so.lsdump b/29/32/x86/source-based/libaaudio.so.lsdump
index 4feae1c..4d56d6a 100644
--- a/29/32/x86/source-based/libaaudio.so.lsdump
+++ b/29/32/x86/source-based/libaaudio.so.lsdump
@@ -1544,12 +1544,21 @@
    "name" : "_ZNK6aaudio21IsochronousClockModel21convertTimeToPositionEx"
   },
   {
+   "name" : "_ZNK6aaudio21IsochronousClockModel22getLateTimeOffsetNanosEv"
+  },
+  {
    "name" : "_ZNK6aaudio21IsochronousClockModel26convertDeltaPositionToTimeEx"
   },
   {
    "name" : "_ZNK6aaudio21IsochronousClockModel26convertDeltaTimeToPositionEx"
   },
   {
+   "name" : "_ZNK6aaudio21IsochronousClockModel27convertLatestTimeToPositionEx"
+  },
+  {
+   "name" : "_ZNK6aaudio21IsochronousClockModel27convertPositionToLatestTimeEx"
+  },
+  {
    "name" : "_ZNK6aaudio21IsochronousClockModel4dumpEv"
   },
   {
@@ -5286,7 +5295,7 @@
      "referenced_type" : "type-157"
     },
     {
-     "referenced_type" : "type-725"
+     "referenced_type" : "type-513"
     }
    ],
    "return_type" : "type-4",
@@ -5788,7 +5797,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     },
     {
      "referenced_type" : "type-4"
@@ -5810,7 +5819,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     },
     {
      "referenced_type" : "type-4"
@@ -5841,10 +5850,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     },
     {
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-578"
     }
    ],
    "return_type" : "type-4",
@@ -5857,7 +5866,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-4",
@@ -5870,7 +5879,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     },
     {
      "referenced_type" : "type-4"
@@ -5886,7 +5895,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-4",
@@ -5899,7 +5908,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     },
     {
      "referenced_type" : "type-4"
@@ -5915,7 +5924,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-4",
@@ -5928,7 +5937,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     },
     {
      "referenced_type" : "type-4"
@@ -5944,7 +5953,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-54",
@@ -5957,13 +5966,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     },
     {
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-792"
+     "referenced_type" : "type-580"
     }
    ],
    "return_type" : "type-4",
@@ -5976,7 +5985,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-54",
@@ -5989,7 +5998,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-54",
@@ -6002,7 +6011,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-54",
@@ -6015,7 +6024,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-54",
@@ -6028,7 +6037,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-54",
@@ -6303,7 +6312,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-4",
@@ -6316,10 +6325,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-802"
+     "referenced_type" : "type-590"
     }
    ],
    "return_type" : "type-4",
@@ -6333,10 +6342,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-795"
+     "referenced_type" : "type-583"
     }
    ],
    "return_type" : "type-4",
@@ -6349,7 +6358,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-54",
@@ -6362,7 +6371,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-4",
@@ -6375,10 +6384,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-795"
+     "referenced_type" : "type-583"
     },
     {
      "referenced_type" : "type-4"
@@ -6394,7 +6403,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     },
     {
      "referenced_type" : "type-4"
@@ -6416,7 +6425,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-54",
@@ -6429,7 +6438,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-54",
@@ -6442,7 +6451,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-54",
@@ -6455,7 +6464,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-54",
@@ -6468,7 +6477,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-54",
@@ -6481,10 +6490,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     },
     {
-     "referenced_type" : "type-810"
+     "referenced_type" : "type-598"
     }
    ],
    "return_type" : "type-4",
@@ -6497,7 +6506,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     }
    ],
    "return_type" : "type-54",
@@ -6510,7 +6519,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     },
     {
      "referenced_type" : "type-4"
@@ -6532,10 +6541,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     },
     {
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     },
     {
      "referenced_type" : "type-258"
@@ -6551,7 +6560,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     }
    ],
    "return_type" : "type-54",
@@ -6564,7 +6573,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     }
    ],
    "return_type" : "type-54",
@@ -6577,7 +6586,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     }
    ],
    "return_type" : "type-54",
@@ -6590,7 +6599,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     }
    ],
    "return_type" : "type-54",
@@ -6603,7 +6612,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     }
    ],
    "return_type" : "type-54",
@@ -7028,10 +7037,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-515"
     },
     {
-     "referenced_type" : "type-733"
+     "referenced_type" : "type-521"
     }
    ],
    "return_type" : "type-4",
@@ -7044,7 +7053,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-515"
     }
    ],
    "return_type" : "type-54",
@@ -7057,7 +7066,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-515"
     }
    ],
    "return_type" : "type-54",
@@ -7070,7 +7079,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-515"
     }
    ],
    "return_type" : "type-54",
@@ -7083,7 +7092,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-515"
     }
    ],
    "return_type" : "type-54",
@@ -7096,7 +7105,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-515"
     }
    ],
    "return_type" : "type-54",
@@ -7592,16 +7601,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-740"
+     "referenced_type" : "type-528"
     }
    ],
-   "return_type" : "type-812",
+   "return_type" : "type-600",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
   {
    "function_name" : "android::IAAudioClient::getDefaultImpl",
    "linker_set_key" : "_ZN7android13IAAudioClient14getDefaultImplEv",
-   "return_type" : "type-745",
+   "return_type" : "type-533",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
   {
@@ -7610,7 +7619,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-813"
+     "referenced_type" : "type-601"
     }
    ],
    "return_type" : "type-16",
@@ -7623,7 +7632,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-532"
     }
    ],
    "return_type" : "type-54",
@@ -7636,7 +7645,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-532"
     }
    ],
    "return_type" : "type-54",
@@ -7649,7 +7658,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-532"
     }
    ],
    "return_type" : "type-54",
@@ -7662,7 +7671,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-532"
     }
    ],
    "return_type" : "type-54",
@@ -7675,16 +7684,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-748"
+     "referenced_type" : "type-536"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-751"
+     "referenced_type" : "type-539"
     },
     {
-     "referenced_type" : "type-752"
+     "referenced_type" : "type-540"
     },
     {
      "default_arg" : true,
@@ -7700,16 +7709,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-557"
     }
    ],
-   "return_type" : "type-814",
+   "return_type" : "type-602",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
   {
    "function_name" : "android::IAAudioService::getDefaultImpl",
    "linker_set_key" : "_ZN7android14IAAudioService14getDefaultImplEv",
-   "return_type" : "type-774",
+   "return_type" : "type-562",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
   {
@@ -7718,7 +7727,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-815"
+     "referenced_type" : "type-603"
     }
    ],
    "return_type" : "type-16",
@@ -7731,7 +7740,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-773"
+     "referenced_type" : "type-561"
     }
    ],
    "return_type" : "type-54",
@@ -7744,7 +7753,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-773"
+     "referenced_type" : "type-561"
     }
    ],
    "return_type" : "type-54",
@@ -7757,7 +7766,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-773"
+     "referenced_type" : "type-561"
     }
    ],
    "return_type" : "type-54",
@@ -7770,7 +7779,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-773"
+     "referenced_type" : "type-561"
     }
    ],
    "return_type" : "type-54",
@@ -7783,16 +7792,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-565"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-568"
     },
     {
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-569"
     },
     {
      "default_arg" : true,
@@ -8900,7 +8909,7 @@
      "referenced_type" : "type-156"
     },
     {
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-509"
     }
    ],
    "return_type" : "type-4",
@@ -8992,10 +9001,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-573"
     },
     {
-     "referenced_type" : "type-786"
+     "referenced_type" : "type-574"
     }
    ],
    "return_type" : "type-4",
@@ -9009,7 +9018,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-573"
     }
    ],
    "return_type" : "type-4",
@@ -9061,6 +9070,20 @@
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
   },
   {
+   "access" : "private",
+   "function_name" : "aaudio::IsochronousClockModel::getLateTimeOffsetNanos",
+   "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel22getLateTimeOffsetNanosEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-193"
+    }
+   ],
+   "return_type" : "type-4",
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
+  },
+  {
    "function_name" : "aaudio::IsochronousClockModel::convertDeltaPositionToTime",
    "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel26convertDeltaPositionToTimeEx",
    "parameters" :
@@ -9093,6 +9116,38 @@
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
   },
   {
+   "function_name" : "aaudio::IsochronousClockModel::convertLatestTimeToPosition",
+   "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel27convertLatestTimeToPositionEx",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-193"
+    },
+    {
+     "referenced_type" : "type-8"
+    }
+   ],
+   "return_type" : "type-8",
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
+  },
+  {
+   "function_name" : "aaudio::IsochronousClockModel::convertPositionToLatestTime",
+   "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel27convertPositionToLatestTimeEx",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-193"
+    },
+    {
+     "referenced_type" : "type-8"
+    }
+   ],
+   "return_type" : "type-8",
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
+  },
+  {
    "function_name" : "aaudio::IsochronousClockModel::dump",
    "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel4dumpEv",
    "parameters" :
@@ -9151,10 +9206,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-797"
+     "referenced_type" : "type-585"
     },
     {
-     "referenced_type" : "type-798"
+     "referenced_type" : "type-586"
     }
    ],
    "return_type" : "type-4",
@@ -9168,7 +9223,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-797"
+     "referenced_type" : "type-585"
     }
    ],
    "return_type" : "type-4",
@@ -9181,10 +9236,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-805"
+     "referenced_type" : "type-593"
     },
     {
-     "referenced_type" : "type-806"
+     "referenced_type" : "type-594"
     }
    ],
    "return_type" : "type-4",
@@ -9198,7 +9253,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-805"
+     "referenced_type" : "type-593"
     }
    ],
    "return_type" : "type-4",
@@ -9241,10 +9296,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-516"
     },
     {
-     "referenced_type" : "type-729"
+     "referenced_type" : "type-517"
     }
    ],
    "return_type" : "type-4",
@@ -9257,10 +9312,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-743"
+     "referenced_type" : "type-531"
     }
    ],
-   "return_type" : "type-741",
+   "return_type" : "type-529",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
   {
@@ -9270,10 +9325,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-772"
+     "referenced_type" : "type-560"
     }
    ],
-   "return_type" : "type-770",
+   "return_type" : "type-558",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
   {
@@ -9302,16 +9357,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-748"
+     "referenced_type" : "type-536"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-751"
+     "referenced_type" : "type-539"
     },
     {
-     "referenced_type" : "type-752"
+     "referenced_type" : "type-540"
     },
     {
      "default_arg" : true,
@@ -9328,16 +9383,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-565"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-568"
     },
     {
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-569"
     },
     {
      "default_arg" : true,
@@ -9354,10 +9409,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-515"
     },
     {
-     "referenced_type" : "type-733"
+     "referenced_type" : "type-521"
     }
    ],
    "return_type" : "type-4",
@@ -9370,10 +9425,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-516"
     },
     {
-     "referenced_type" : "type-729"
+     "referenced_type" : "type-517"
     }
    ],
    "return_type" : "type-4",
@@ -9514,8 +9569,8 @@
    "alignment" : 4,
    "linker_set_key" : "const aaudio::AudioStreamBuilder &",
    "name" : "const aaudio::AudioStreamBuilder &",
-   "referenced_type" : "type-685",
-   "self_type" : "type-687",
+   "referenced_type" : "type-774",
+   "self_type" : "type-776",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
@@ -9631,8 +9686,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AudioClient &",
    "name" : "const android::AudioClient &",
-   "referenced_type" : "type-581",
-   "self_type" : "type-583",
+   "referenced_type" : "type-547",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9640,8 +9695,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AudioClient &",
    "name" : "const android::AudioClient &",
-   "referenced_type" : "type-656",
-   "self_type" : "type-658",
+   "referenced_type" : "type-670",
+   "self_type" : "type-672",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AudioClient &",
+   "name" : "const android::AudioClient &",
+   "referenced_type" : "type-745",
+   "self_type" : "type-747",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
@@ -9649,17 +9713,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AudioClient &",
    "name" : "const android::AudioClient &",
-   "referenced_type" : "type-715",
-   "self_type" : "type-717",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AudioClient &",
-   "name" : "const android::AudioClient &",
-   "referenced_type" : "type-759",
-   "self_type" : "type-761",
+   "referenced_type" : "type-804",
+   "self_type" : "type-806",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9704,7 +9759,7 @@
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
    "referenced_type" : "type-1187",
-   "self_type" : "type-1189",
+   "self_type" : "type-1190",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -9721,8 +9776,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-749",
-   "self_type" : "type-751",
+   "referenced_type" : "type-537",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -9730,8 +9785,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-778",
-   "self_type" : "type-780",
+   "referenced_type" : "type-566",
+   "self_type" : "type-568",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -9758,7 +9813,7 @@
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
    "referenced_type" : "type-1173",
-   "self_type" : "type-1178",
+   "self_type" : "type-1179",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -9775,8 +9830,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-736",
-   "self_type" : "type-741",
+   "referenced_type" : "type-524",
+   "self_type" : "type-529",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -9784,8 +9839,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-765",
-   "self_type" : "type-770",
+   "referenced_type" : "type-553",
+   "self_type" : "type-558",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -9829,19 +9884,19 @@
    "alignment" : 4,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "referenced_type" : "type-694",
-   "self_type" : "type-696",
+   "referenced_type" : "type-581",
+   "self_type" : "type-583",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "referenced_type" : "type-793",
-   "self_type" : "type-795",
+   "referenced_type" : "type-783",
+   "self_type" : "type-785",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
   {
    "alignment" : 4,
@@ -9865,7 +9920,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-1059",
+   "referenced_type" : "type-1061",
    "self_type" : "type-1063",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
@@ -9937,8 +9992,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-578",
-   "self_type" : "type-580",
+   "referenced_type" : "type-544",
+   "self_type" : "type-546",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9946,8 +10001,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-710",
-   "self_type" : "type-712",
+   "referenced_type" : "type-667",
+   "self_type" : "type-669",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9955,8 +10010,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-754",
-   "self_type" : "type-758",
+   "referenced_type" : "type-799",
+   "self_type" : "type-801",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10009,8 +10064,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IBinder> &",
    "name" : "const android::sp<android::IBinder> &",
-   "referenced_type" : "type-738",
-   "self_type" : "type-740",
+   "referenced_type" : "type-526",
+   "self_type" : "type-528",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -10018,8 +10073,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IBinder> &",
    "name" : "const android::sp<android::IBinder> &",
-   "referenced_type" : "type-767",
-   "self_type" : "type-769",
+   "referenced_type" : "type-555",
+   "self_type" : "type-557",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -10108,8 +10163,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-587",
-   "self_type" : "type-589",
+   "referenced_type" : "type-550",
+   "self_type" : "type-552",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10117,8 +10172,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-718",
-   "self_type" : "type-720",
+   "referenced_type" : "type-676",
+   "self_type" : "type-678",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10126,8 +10181,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-762",
-   "self_type" : "type-764",
+   "referenced_type" : "type-807",
+   "self_type" : "type-809",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10162,8 +10217,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> > &",
    "name" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> > &",
-   "referenced_type" : "type-746",
-   "self_type" : "type-745",
+   "referenced_type" : "type-534",
+   "self_type" : "type-533",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -10189,8 +10244,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> > &",
    "name" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> > &",
-   "referenced_type" : "type-775",
-   "self_type" : "type-774",
+   "referenced_type" : "type-563",
+   "self_type" : "type-562",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -10255,8 +10310,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamBuilderStruct *",
    "name" : "AAudioStreamBuilderStruct *",
-   "referenced_type" : "type-604",
-   "self_type" : "type-603",
+   "referenced_type" : "type-693",
+   "self_type" : "type-692",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10309,8 +10364,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamBuilderStruct **",
    "name" : "AAudioStreamBuilderStruct **",
-   "referenced_type" : "type-603",
-   "self_type" : "type-607",
+   "referenced_type" : "type-692",
+   "self_type" : "type-696",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10327,8 +10382,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-1062",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-1060",
+   "self_type" : "type-1059",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10588,15 +10643,6 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-513",
-   "self_type" : "type-512",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
    "referenced_type" : "type-52",
    "self_type" : "type-51",
    "size" : 4,
@@ -10606,8 +10652,17 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
+   "referenced_type" : "type-543",
+   "self_type" : "type-542",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-687",
+   "self_type" : "type-686",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10615,8 +10670,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-602",
-   "self_type" : "type-601",
+   "referenced_type" : "type-691",
+   "self_type" : "type-690",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10624,8 +10679,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-613",
+   "referenced_type" : "type-703",
+   "self_type" : "type-702",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10633,8 +10688,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-624",
-   "self_type" : "type-623",
+   "referenced_type" : "type-713",
+   "self_type" : "type-712",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10642,8 +10697,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-631",
-   "self_type" : "type-630",
+   "referenced_type" : "type-720",
+   "self_type" : "type-719",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10651,8 +10706,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-670",
-   "self_type" : "type-669",
+   "referenced_type" : "type-759",
+   "self_type" : "type-758",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10660,8 +10715,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-678",
-   "self_type" : "type-677",
+   "referenced_type" : "type-767",
+   "self_type" : "type-766",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10669,8 +10724,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-683",
-   "self_type" : "type-682",
+   "referenced_type" : "type-772",
+   "self_type" : "type-771",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10678,8 +10733,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-757",
-   "self_type" : "type-756",
+   "referenced_type" : "type-814",
+   "self_type" : "type-813",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10795,8 +10850,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct **",
    "name" : "AAudioStreamStruct **",
-   "referenced_type" : "type-597",
-   "self_type" : "type-600",
+   "referenced_type" : "type-686",
+   "self_type" : "type-689",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10922,7 +10977,7 @@
    "linker_set_key" : "aaudio::AAudioStreamConfiguration *",
    "name" : "aaudio::AAudioStreamConfiguration *",
    "referenced_type" : "type-150",
-   "self_type" : "type-727",
+   "self_type" : "type-515",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -11084,7 +11139,7 @@
    "linker_set_key" : "aaudio::RingBufferDescriptor_s *",
    "name" : "aaudio::RingBufferDescriptor_s *",
    "referenced_type" : "type-40",
-   "self_type" : "type-792",
+   "self_type" : "type-580",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11093,7 +11148,7 @@
    "linker_set_key" : "aaudio::RingBufferParcelable *",
    "name" : "aaudio::RingBufferParcelable *",
    "referenced_type" : "type-29",
-   "self_type" : "type-783",
+   "self_type" : "type-571",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11102,7 +11157,7 @@
    "linker_set_key" : "aaudio::SharedMemoryParcelable *",
    "name" : "aaudio::SharedMemoryParcelable *",
    "referenced_type" : "type-35",
-   "self_type" : "type-791",
+   "self_type" : "type-579",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11111,7 +11166,7 @@
    "linker_set_key" : "aaudio::SharedRegionParcelable *",
    "name" : "aaudio::SharedRegionParcelable *",
    "referenced_type" : "type-30",
-   "self_type" : "type-803",
+   "self_type" : "type-591",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -11120,7 +11175,7 @@
    "linker_set_key" : "android::BnAAudioClient *",
    "name" : "android::BnAAudioClient *",
    "referenced_type" : "type-165",
-   "self_type" : "type-748",
+   "self_type" : "type-536",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -11129,7 +11184,7 @@
    "linker_set_key" : "android::BnAAudioService *",
    "name" : "android::BnAAudioService *",
    "referenced_type" : "type-170",
-   "self_type" : "type-777",
+   "self_type" : "type-565",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -11173,8 +11228,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ExtendedTimestamp *",
    "name" : "android::ExtendedTimestamp *",
-   "referenced_type" : "type-620",
-   "self_type" : "type-619",
+   "referenced_type" : "type-709",
+   "self_type" : "type-708",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -11228,7 +11283,7 @@
    "linker_set_key" : "android::IAAudioClient *",
    "name" : "android::IAAudioClient *",
    "referenced_type" : "type-161",
-   "self_type" : "type-744",
+   "self_type" : "type-532",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -11237,7 +11292,7 @@
    "linker_set_key" : "android::IAAudioService *",
    "name" : "android::IAAudioService *",
    "referenced_type" : "type-168",
-   "self_type" : "type-773",
+   "self_type" : "type-561",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -11398,17 +11453,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-700",
-   "self_type" : "type-699",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel *",
-   "name" : "android::Parcel *",
-   "referenced_type" : "type-722",
-   "self_type" : "type-721",
+   "referenced_type" : "type-510",
+   "self_type" : "type-509",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -11416,8 +11462,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-730",
-   "self_type" : "type-729",
+   "referenced_type" : "type-518",
+   "self_type" : "type-517",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -11425,8 +11471,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-753",
-   "self_type" : "type-752",
+   "referenced_type" : "type-541",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -11434,8 +11480,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-782",
-   "self_type" : "type-781",
+   "referenced_type" : "type-570",
+   "self_type" : "type-569",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -11443,8 +11489,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-787",
-   "self_type" : "type-786",
+   "referenced_type" : "type-575",
+   "self_type" : "type-574",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11452,8 +11498,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-799",
-   "self_type" : "type-798",
+   "referenced_type" : "type-587",
+   "self_type" : "type-586",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -11461,13 +11507,22 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-807",
-   "self_type" : "type-806",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::Parcel *",
+   "name" : "android::Parcel *",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::WrappingBuffer *",
    "name" : "android::WrappingBuffer *",
    "referenced_type" : "type-205",
@@ -11507,7 +11562,7 @@
    "linker_set_key" : "const aaudio::AAudioStreamConfiguration *",
    "name" : "const aaudio::AAudioStreamConfiguration *",
    "referenced_type" : "type-159",
-   "self_type" : "type-728",
+   "self_type" : "type-516",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -11632,8 +11687,8 @@
    "alignment" : 4,
    "linker_set_key" : "const aaudio::RingBufferParcelable *",
    "name" : "const aaudio::RingBufferParcelable *",
-   "referenced_type" : "type-784",
-   "self_type" : "type-785",
+   "referenced_type" : "type-572",
+   "self_type" : "type-573",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11641,8 +11696,8 @@
    "alignment" : 4,
    "linker_set_key" : "const aaudio::SharedMemoryParcelable *",
    "name" : "const aaudio::SharedMemoryParcelable *",
-   "referenced_type" : "type-796",
-   "self_type" : "type-797",
+   "referenced_type" : "type-584",
+   "self_type" : "type-585",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -11650,8 +11705,8 @@
    "alignment" : 4,
    "linker_set_key" : "const aaudio::SharedRegionParcelable *",
    "name" : "const aaudio::SharedRegionParcelable *",
-   "referenced_type" : "type-804",
-   "self_type" : "type-805",
+   "referenced_type" : "type-592",
+   "self_type" : "type-593",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -11668,8 +11723,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IAAudioClient *",
    "name" : "const android::IAAudioClient *",
-   "referenced_type" : "type-742",
-   "self_type" : "type-743",
+   "referenced_type" : "type-530",
+   "self_type" : "type-531",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -11677,8 +11732,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IAAudioService *",
    "name" : "const android::IAAudioService *",
-   "referenced_type" : "type-771",
-   "self_type" : "type-772",
+   "referenced_type" : "type-559",
+   "self_type" : "type-560",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -11803,17 +11858,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-701",
-   "self_type" : "type-704",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Parcel *",
-   "name" : "const android::Parcel *",
-   "referenced_type" : "type-723",
-   "self_type" : "type-725",
+   "referenced_type" : "type-511",
+   "self_type" : "type-513",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -11821,8 +11867,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-731",
-   "self_type" : "type-733",
+   "referenced_type" : "type-519",
+   "self_type" : "type-521",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -11830,8 +11876,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-788",
-   "self_type" : "type-790",
+   "referenced_type" : "type-576",
+   "self_type" : "type-578",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11839,8 +11885,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-800",
-   "self_type" : "type-802",
+   "referenced_type" : "type-588",
+   "self_type" : "type-590",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -11848,13 +11894,22 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-808",
-   "self_type" : "type-810",
+   "referenced_type" : "type-596",
+   "self_type" : "type-598",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::Parcel *",
+   "name" : "const android::Parcel *",
+   "referenced_type" : "type-790",
+   "self_type" : "type-793",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
    "referenced_type" : "type-209",
@@ -12118,8 +12173,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::atomic<long long> *",
    "name" : "std::atomic<long long> *",
-   "referenced_type" : "type-639",
-   "self_type" : "type-638",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/fifo/FifoControllerIndirect.h"
   },
@@ -12309,8 +12364,8 @@
    "is_const" : true,
    "linker_set_key" : "const aaudio::AudioStreamBuilder",
    "name" : "const aaudio::AudioStreamBuilder",
-   "referenced_type" : "type-686",
-   "self_type" : "type-685",
+   "referenced_type" : "type-775",
+   "self_type" : "type-774",
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
   {
@@ -12328,7 +12383,7 @@
    "name" : "const aaudio::AudioStreamInternal",
    "referenced_type" : "type-6",
    "self_type" : "type-65",
-   "size" : 1184,
+   "size" : 1192,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
   {
@@ -12338,7 +12393,7 @@
    "name" : "const aaudio::AudioStreamInternalCapture",
    "referenced_type" : "type-69",
    "self_type" : "type-70",
-   "size" : 1192,
+   "size" : 1200,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalCapture.h"
   },
   {
@@ -12348,7 +12403,7 @@
    "name" : "const aaudio::AudioStreamInternalPlay",
    "referenced_type" : "type-113",
    "self_type" : "type-114",
-   "size" : 1216,
+   "size" : 1224,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
   {
@@ -12388,7 +12443,7 @@
    "name" : "const aaudio::IsochronousClockModel",
    "referenced_type" : "type-7",
    "self_type" : "type-192",
-   "size" : 36,
+   "size" : 44,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
   },
   {
@@ -12397,7 +12452,7 @@
    "linker_set_key" : "const aaudio::RingBufferParcelable",
    "name" : "const aaudio::RingBufferParcelable",
    "referenced_type" : "type-29",
-   "self_type" : "type-784",
+   "self_type" : "type-572",
    "size" : 68,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -12407,7 +12462,7 @@
    "linker_set_key" : "const aaudio::SharedMemoryParcelable",
    "name" : "const aaudio::SharedMemoryParcelable",
    "referenced_type" : "type-35",
-   "self_type" : "type-796",
+   "self_type" : "type-584",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -12417,7 +12472,7 @@
    "linker_set_key" : "const aaudio::SharedRegionParcelable",
    "name" : "const aaudio::SharedRegionParcelable",
    "referenced_type" : "type-30",
-   "self_type" : "type-804",
+   "self_type" : "type-592",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -12536,8 +12591,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-582",
-   "self_type" : "type-581",
+   "referenced_type" : "type-548",
+   "self_type" : "type-547",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -12546,8 +12601,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-657",
-   "self_type" : "type-656",
+   "referenced_type" : "type-671",
+   "self_type" : "type-670",
+   "size" : 20,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::AudioClient",
+   "name" : "const android::AudioClient",
+   "referenced_type" : "type-746",
+   "self_type" : "type-745",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
@@ -12556,18 +12621,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-716",
-   "self_type" : "type-715",
-   "size" : 20,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::AudioClient",
-   "name" : "const android::AudioClient",
-   "referenced_type" : "type-760",
-   "self_type" : "type-759",
+   "referenced_type" : "type-805",
+   "self_type" : "type-804",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -12607,7 +12662,7 @@
    "linker_set_key" : "const android::IAAudioClient",
    "name" : "const android::IAAudioClient",
    "referenced_type" : "type-161",
-   "self_type" : "type-742",
+   "self_type" : "type-530",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12617,7 +12672,7 @@
    "linker_set_key" : "const android::IAAudioService",
    "name" : "const android::IAAudioService",
    "referenced_type" : "type-168",
-   "self_type" : "type-771",
+   "self_type" : "type-559",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -12796,18 +12851,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-702",
-   "self_type" : "type-701",
-   "size" : 60,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Parcel",
-   "name" : "const android::Parcel",
-   "referenced_type" : "type-724",
-   "self_type" : "type-723",
+   "referenced_type" : "type-512",
+   "self_type" : "type-511",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -12816,8 +12861,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-732",
-   "self_type" : "type-731",
+   "referenced_type" : "type-520",
+   "self_type" : "type-519",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -12826,8 +12871,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-750",
-   "self_type" : "type-749",
+   "referenced_type" : "type-538",
+   "self_type" : "type-537",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12836,8 +12881,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-779",
-   "self_type" : "type-778",
+   "referenced_type" : "type-567",
+   "self_type" : "type-566",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -12846,8 +12891,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-789",
-   "self_type" : "type-788",
+   "referenced_type" : "type-577",
+   "self_type" : "type-576",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -12856,8 +12901,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-801",
-   "self_type" : "type-800",
+   "referenced_type" : "type-589",
+   "self_type" : "type-588",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -12866,14 +12911,24 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-809",
-   "self_type" : "type-808",
+   "referenced_type" : "type-597",
+   "self_type" : "type-596",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::Parcel",
+   "name" : "const android::Parcel",
+   "referenced_type" : "type-791",
+   "self_type" : "type-790",
+   "size" : 60,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
    "referenced_type" : "type-1012",
@@ -13086,8 +13141,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-575",
-   "self_type" : "type-574",
+   "referenced_type" : "type-525",
+   "self_type" : "type-524",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13096,8 +13151,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-609",
-   "self_type" : "type-608",
+   "referenced_type" : "type-554",
+   "self_type" : "type-553",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13106,8 +13161,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-665",
-   "self_type" : "type-664",
+   "referenced_type" : "type-664",
+   "self_type" : "type-663",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13116,8 +13171,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-674",
-   "self_type" : "type-673",
+   "referenced_type" : "type-698",
+   "self_type" : "type-697",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13126,8 +13181,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-690",
-   "self_type" : "type-689",
+   "referenced_type" : "type-754",
+   "self_type" : "type-753",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13136,8 +13191,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-707",
-   "self_type" : "type-706",
+   "referenced_type" : "type-763",
+   "self_type" : "type-762",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13146,8 +13201,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-779",
+   "self_type" : "type-778",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13156,8 +13211,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
+   "referenced_type" : "type-796",
+   "self_type" : "type-795",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13266,20 +13321,20 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-695",
-   "self_type" : "type-694",
+   "referenced_type" : "type-582",
+   "self_type" : "type-581",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-794",
-   "self_type" : "type-793",
+   "referenced_type" : "type-784",
+   "self_type" : "type-783",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
   {
    "alignment" : 4,
@@ -13586,8 +13641,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-511",
-   "self_type" : "type-510",
+   "referenced_type" : "type-523",
+   "self_type" : "type-522",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13596,8 +13651,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-585",
-   "self_type" : "type-584",
+   "referenced_type" : "type-674",
+   "self_type" : "type-673",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13606,8 +13661,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-606",
-   "self_type" : "type-605",
+   "referenced_type" : "type-695",
+   "self_type" : "type-694",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13616,8 +13671,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-612",
-   "self_type" : "type-611",
+   "referenced_type" : "type-701",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13626,8 +13681,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
+   "referenced_type" : "type-711",
+   "self_type" : "type-710",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13636,8 +13691,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-629",
-   "self_type" : "type-628",
+   "referenced_type" : "type-718",
+   "self_type" : "type-717",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13646,8 +13701,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-668",
-   "self_type" : "type-667",
+   "referenced_type" : "type-757",
+   "self_type" : "type-756",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13656,8 +13711,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-676",
-   "self_type" : "type-675",
+   "referenced_type" : "type-765",
+   "self_type" : "type-764",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13666,8 +13721,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-680",
-   "self_type" : "type-679",
+   "referenced_type" : "type-769",
+   "self_type" : "type-768",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13676,8 +13731,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-735",
-   "self_type" : "type-734",
+   "referenced_type" : "type-812",
+   "self_type" : "type-811",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13926,8 +13981,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-644",
+   "self_type" : "type-643",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -13936,8 +13991,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-617",
-   "self_type" : "type-616",
+   "referenced_type" : "type-706",
+   "self_type" : "type-705",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -13946,8 +14001,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-626",
-   "self_type" : "type-625",
+   "referenced_type" : "type-715",
+   "self_type" : "type-714",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -13956,8 +14011,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-634",
-   "self_type" : "type-633",
+   "referenced_type" : "type-723",
+   "self_type" : "type-722",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -14016,8 +14071,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioClient>",
    "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-1060",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-1062",
+   "self_type" : "type-1061",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -14084,30 +14139,30 @@
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::IAAudioClient>",
-   "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-579",
-   "self_type" : "type-578",
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioClient>",
    "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-711",
-   "self_type" : "type-710",
+   "referenced_type" : "type-545",
+   "self_type" : "type-544",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IAAudioClient>",
+   "name" : "const android::sp<android::IAAudioClient>",
+   "referenced_type" : "type-668",
+   "self_type" : "type-667",
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioClient>",
    "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-755",
-   "self_type" : "type-754",
+   "referenced_type" : "type-800",
+   "self_type" : "type-799",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -14134,8 +14189,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioService>",
    "name" : "const android::sp<android::IAAudioService>",
-   "referenced_type" : "type-1146",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-1147",
+   "self_type" : "type-1146",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -14154,8 +14209,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioService>",
    "name" : "const android::sp<android::IAAudioService>",
-   "referenced_type" : "type-709",
-   "self_type" : "type-708",
+   "referenced_type" : "type-798",
+   "self_type" : "type-797",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -14204,8 +14259,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IBinder>",
    "name" : "const android::sp<android::IBinder>",
-   "referenced_type" : "type-739",
-   "self_type" : "type-738",
+   "referenced_type" : "type-527",
+   "self_type" : "type-526",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -14214,8 +14269,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IBinder>",
    "name" : "const android::sp<android::IBinder>",
-   "referenced_type" : "type-768",
-   "self_type" : "type-767",
+   "referenced_type" : "type-556",
+   "self_type" : "type-555",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -14295,24 +14350,24 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-588",
-   "self_type" : "type-587",
+   "referenced_type" : "type-551",
+   "self_type" : "type-550",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-719",
-   "self_type" : "type-718",
+   "referenced_type" : "type-677",
+   "self_type" : "type-676",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-763",
-   "self_type" : "type-762",
+   "referenced_type" : "type-808",
+   "self_type" : "type-807",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
@@ -14418,8 +14473,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> >",
    "name" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> >",
-   "referenced_type" : "type-747",
-   "self_type" : "type-746",
+   "referenced_type" : "type-535",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -14448,8 +14503,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> >",
    "name" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> >",
-   "referenced_type" : "type-776",
-   "self_type" : "type-775",
+   "referenced_type" : "type-564",
+   "self_type" : "type-563",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -16385,109 +16440,109 @@
     {
      "access" : "protected",
      "field_name" : "mAudioEndpoint",
-     "field_offset" : 1376,
+     "field_offset" : 1440,
      "referenced_type" : "type-10"
     },
     {
      "access" : "protected",
      "field_name" : "mServiceStreamHandle",
-     "field_offset" : 1632,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mFramesPerBurst",
-     "field_offset" : 1664,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mXRunCount",
      "field_offset" : 1696,
      "referenced_type" : "type-4"
     },
     {
      "access" : "protected",
-     "field_name" : "mFramesOffsetFromService",
+     "field_name" : "mFramesPerBurst",
      "field_offset" : 1728,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mXRunCount",
+     "field_offset" : 1760,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mFramesOffsetFromService",
+     "field_offset" : 1792,
      "referenced_type" : "type-8"
     },
     {
      "access" : "protected",
      "field_name" : "mCallbackBuffer",
-     "field_offset" : 1792,
+     "field_offset" : 1856,
      "referenced_type" : "type-14"
     },
     {
      "access" : "protected",
      "field_name" : "mCallbackFrames",
-     "field_offset" : 1824,
+     "field_offset" : 1888,
      "referenced_type" : "type-4"
     },
     {
      "access" : "protected",
      "field_name" : "mInService",
-     "field_offset" : 1856,
+     "field_offset" : 1920,
      "referenced_type" : "type-16"
     },
     {
      "access" : "protected",
      "field_name" : "mServiceInterface",
-     "field_offset" : 1888,
+     "field_offset" : 1952,
      "referenced_type" : "type-18"
     },
     {
      "access" : "protected",
      "field_name" : "mAtomicInternalTimestamp",
-     "field_offset" : 1920,
+     "field_offset" : 1984,
      "referenced_type" : "type-20"
     },
     {
      "access" : "protected",
      "field_name" : "mNeedCatchUp",
-     "field_offset" : 2208,
+     "field_offset" : 2272,
      "referenced_type" : "type-24"
     },
     {
      "access" : "protected",
      "field_name" : "mStreamVolume",
-     "field_offset" : 2272,
+     "field_offset" : 2336,
      "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mWakeupDelayNanos",
-     "field_offset" : 2304,
+     "field_offset" : 2368,
      "referenced_type" : "type-13"
     },
     {
      "access" : "private",
      "field_name" : "mMinimumSleepNanos",
-     "field_offset" : 2336,
+     "field_offset" : 2400,
      "referenced_type" : "type-13"
     },
     {
      "access" : "private",
      "field_name" : "mEndPointParcelable",
-     "field_offset" : 2368,
+     "field_offset" : 2432,
      "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mEndpointDescriptor",
-     "field_offset" : 8704,
+     "field_offset" : 8768,
      "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mServiceLatencyNanos",
-     "field_offset" : 9376,
+     "field_offset" : 9440,
      "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mDeviceChannelCount",
-     "field_offset" : 9440,
+     "field_offset" : 9504,
      "referenced_type" : "type-4"
     }
    ],
@@ -16496,7 +16551,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-6",
    "self_type" : "type-6",
-   "size" : 1184,
+   "size" : 1192,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h",
    "unique_id" : "_ZTSN6aaudio19AudioStreamInternalE",
    "vtable_components" :
@@ -16633,7 +16688,7 @@
     {
      "access" : "private",
      "field_name" : "mLastFramesWritten",
-     "field_offset" : 9472,
+     "field_offset" : 9536,
      "referenced_type" : "type-8"
     }
    ],
@@ -16642,7 +16697,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-69",
    "self_type" : "type-69",
-   "size" : 1192,
+   "size" : 1200,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalCapture.h",
    "unique_id" : "_ZTSN6aaudio26AudioStreamInternalCaptureE",
    "vtable_components" :
@@ -16773,13 +16828,13 @@
     {
      "access" : "private",
      "field_name" : "mLastFramesRead",
-     "field_offset" : 9472,
+     "field_offset" : 9536,
      "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mFlowGraph",
-     "field_offset" : 9536,
+     "field_offset" : 9600,
      "referenced_type" : "type-106"
     }
    ],
@@ -16788,7 +16843,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-113",
    "self_type" : "type-113",
-   "size" : 1216,
+   "size" : 1224,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h",
    "unique_id" : "_ZTSN6aaudio23AudioStreamInternalPlayE",
    "vtable_components" :
@@ -17585,15 +17640,27 @@
     },
     {
      "access" : "private",
-     "field_name" : "mMaxLatenessInNanos",
+     "field_name" : "mBurstPeriodNanos",
      "field_offset" : 224,
      "referenced_type" : "type-4"
     },
     {
      "access" : "private",
-     "field_name" : "mState",
+     "field_name" : "mMaxMeasuredLatenessNanos",
      "field_offset" : 256,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mState",
+     "field_offset" : 288,
      "referenced_type" : "type-9"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampCount",
+     "field_offset" : 320,
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "aaudio::IsochronousClockModel",
@@ -17601,7 +17668,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-7",
    "self_type" : "type-7",
-   "size" : 36,
+   "size" : 44,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h",
    "unique_id" : "_ZTSN6aaudio21IsochronousClockModelE",
    "vtable_components" :
diff --git a/29/64/arm64_armv8-a/source-based/libaaudio.so.lsdump b/29/64/arm64_armv8-a/source-based/libaaudio.so.lsdump
index 56e6ac2..868c319 100644
--- a/29/64/arm64_armv8-a/source-based/libaaudio.so.lsdump
+++ b/29/64/arm64_armv8-a/source-based/libaaudio.so.lsdump
@@ -1520,12 +1520,21 @@
    "name" : "_ZNK6aaudio21IsochronousClockModel21convertTimeToPositionEl"
   },
   {
+   "name" : "_ZNK6aaudio21IsochronousClockModel22getLateTimeOffsetNanosEv"
+  },
+  {
    "name" : "_ZNK6aaudio21IsochronousClockModel26convertDeltaPositionToTimeEl"
   },
   {
    "name" : "_ZNK6aaudio21IsochronousClockModel26convertDeltaTimeToPositionEl"
   },
   {
+   "name" : "_ZNK6aaudio21IsochronousClockModel27convertLatestTimeToPositionEl"
+  },
+  {
+   "name" : "_ZNK6aaudio21IsochronousClockModel27convertPositionToLatestTimeEl"
+  },
+  {
    "name" : "_ZNK6aaudio21IsochronousClockModel4dumpEv"
   },
   {
@@ -5137,7 +5146,7 @@
      "referenced_type" : "type-156"
     },
     {
-     "referenced_type" : "type-725"
+     "referenced_type" : "type-729"
     }
    ],
    "return_type" : "type-4",
@@ -5639,7 +5648,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-782"
+     "referenced_type" : "type-786"
     },
     {
      "referenced_type" : "type-4"
@@ -5661,7 +5670,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-782"
+     "referenced_type" : "type-786"
     },
     {
      "referenced_type" : "type-4"
@@ -5692,10 +5701,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-782"
+     "referenced_type" : "type-786"
     },
     {
-     "referenced_type" : "type-789"
+     "referenced_type" : "type-793"
     }
    ],
    "return_type" : "type-4",
@@ -5708,7 +5717,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-782"
+     "referenced_type" : "type-786"
     }
    ],
    "return_type" : "type-4",
@@ -5721,7 +5730,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-782"
+     "referenced_type" : "type-786"
     },
     {
      "referenced_type" : "type-4"
@@ -5737,7 +5746,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-782"
+     "referenced_type" : "type-786"
     }
    ],
    "return_type" : "type-4",
@@ -5750,7 +5759,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-782"
+     "referenced_type" : "type-786"
     },
     {
      "referenced_type" : "type-4"
@@ -5766,7 +5775,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-782"
+     "referenced_type" : "type-786"
     }
    ],
    "return_type" : "type-4",
@@ -5779,7 +5788,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-782"
+     "referenced_type" : "type-786"
     },
     {
      "referenced_type" : "type-4"
@@ -5795,7 +5804,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-782"
+     "referenced_type" : "type-786"
     }
    ],
    "return_type" : "type-54",
@@ -5808,13 +5817,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-782"
+     "referenced_type" : "type-786"
     },
     {
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-794"
     },
     {
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-795"
     }
    ],
    "return_type" : "type-4",
@@ -5827,7 +5836,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-782"
+     "referenced_type" : "type-786"
     }
    ],
    "return_type" : "type-54",
@@ -5840,7 +5849,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-782"
+     "referenced_type" : "type-786"
     }
    ],
    "return_type" : "type-54",
@@ -5853,7 +5862,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-782"
+     "referenced_type" : "type-786"
     }
    ],
    "return_type" : "type-54",
@@ -5866,7 +5875,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-782"
+     "referenced_type" : "type-786"
     }
    ],
    "return_type" : "type-54",
@@ -5879,7 +5888,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-782"
+     "referenced_type" : "type-786"
     }
    ],
    "return_type" : "type-54",
@@ -6154,7 +6163,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-794"
     }
    ],
    "return_type" : "type-4",
@@ -6167,10 +6176,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-794"
     },
     {
-     "referenced_type" : "type-801"
+     "referenced_type" : "type-805"
     }
    ],
    "return_type" : "type-4",
@@ -6184,10 +6193,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-794"
     },
     {
-     "referenced_type" : "type-794"
+     "referenced_type" : "type-798"
     }
    ],
    "return_type" : "type-4",
@@ -6200,7 +6209,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-794"
     }
    ],
    "return_type" : "type-54",
@@ -6213,7 +6222,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-794"
     }
    ],
    "return_type" : "type-4",
@@ -6226,10 +6235,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-794"
     },
     {
-     "referenced_type" : "type-794"
+     "referenced_type" : "type-798"
     },
     {
      "referenced_type" : "type-4"
@@ -6245,7 +6254,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-794"
     },
     {
      "referenced_type" : "type-4"
@@ -6267,7 +6276,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-794"
     }
    ],
    "return_type" : "type-54",
@@ -6280,7 +6289,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-794"
     }
    ],
    "return_type" : "type-54",
@@ -6293,7 +6302,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-794"
     }
    ],
    "return_type" : "type-54",
@@ -6306,7 +6315,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-794"
     }
    ],
    "return_type" : "type-54",
@@ -6319,7 +6328,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-794"
     }
    ],
    "return_type" : "type-54",
@@ -6332,10 +6341,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-802"
+     "referenced_type" : "type-806"
     },
     {
-     "referenced_type" : "type-809"
+     "referenced_type" : "type-813"
     }
    ],
    "return_type" : "type-4",
@@ -6348,7 +6357,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-802"
+     "referenced_type" : "type-806"
     }
    ],
    "return_type" : "type-54",
@@ -6361,7 +6370,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-802"
+     "referenced_type" : "type-806"
     },
     {
      "referenced_type" : "type-4"
@@ -6383,10 +6392,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-802"
+     "referenced_type" : "type-806"
     },
     {
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-794"
     },
     {
      "referenced_type" : "type-253"
@@ -6402,7 +6411,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-802"
+     "referenced_type" : "type-806"
     }
    ],
    "return_type" : "type-54",
@@ -6415,7 +6424,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-802"
+     "referenced_type" : "type-806"
     }
    ],
    "return_type" : "type-54",
@@ -6428,7 +6437,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-802"
+     "referenced_type" : "type-806"
     }
    ],
    "return_type" : "type-54",
@@ -6441,7 +6450,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-802"
+     "referenced_type" : "type-806"
     }
    ],
    "return_type" : "type-54",
@@ -6454,7 +6463,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-802"
+     "referenced_type" : "type-806"
     }
    ],
    "return_type" : "type-54",
@@ -6467,7 +6476,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-481"
     },
     {
      "referenced_type" : "type-491"
@@ -6483,7 +6492,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-481"
     },
     {
      "referenced_type" : "type-484"
@@ -6502,7 +6511,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-481"
     }
    ],
    "return_type" : "type-54",
@@ -6515,7 +6524,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-481"
     }
    ],
    "return_type" : "type-4",
@@ -6528,7 +6537,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-481"
     },
     {
      "referenced_type" : "type-492"
@@ -6544,7 +6553,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-481"
     }
    ],
    "return_type" : "type-54",
@@ -6557,7 +6566,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-481"
     }
    ],
    "return_type" : "type-54",
@@ -6570,7 +6579,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-481"
     }
    ],
    "return_type" : "type-54",
@@ -6583,7 +6592,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-481"
     }
    ],
    "return_type" : "type-54",
@@ -6596,7 +6605,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-481"
     }
    ],
    "return_type" : "type-54",
@@ -6879,10 +6888,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-730"
     },
     {
-     "referenced_type" : "type-732"
+     "referenced_type" : "type-738"
     }
    ],
    "return_type" : "type-4",
@@ -6895,7 +6904,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-730"
     }
    ],
    "return_type" : "type-54",
@@ -6908,7 +6917,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-730"
     }
    ],
    "return_type" : "type-54",
@@ -6921,7 +6930,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-730"
     }
    ],
    "return_type" : "type-54",
@@ -6934,7 +6943,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-730"
     }
    ],
    "return_type" : "type-54",
@@ -6947,7 +6956,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-730"
     }
    ],
    "return_type" : "type-54",
@@ -7443,16 +7452,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-739"
+     "referenced_type" : "type-743"
     }
    ],
-   "return_type" : "type-811",
+   "return_type" : "type-815",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
   {
    "function_name" : "android::IAAudioClient::getDefaultImpl",
    "linker_set_key" : "_ZN7android13IAAudioClient14getDefaultImplEv",
-   "return_type" : "type-744",
+   "return_type" : "type-748",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
   {
@@ -7461,7 +7470,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-812"
+     "referenced_type" : "type-816"
     }
    ],
    "return_type" : "type-16",
@@ -7474,7 +7483,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-743"
+     "referenced_type" : "type-747"
     }
    ],
    "return_type" : "type-54",
@@ -7487,7 +7496,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-743"
+     "referenced_type" : "type-747"
     }
    ],
    "return_type" : "type-54",
@@ -7500,7 +7509,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-743"
+     "referenced_type" : "type-747"
     }
    ],
    "return_type" : "type-54",
@@ -7513,7 +7522,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-743"
+     "referenced_type" : "type-747"
     }
    ],
    "return_type" : "type-54",
@@ -7526,16 +7535,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-747"
+     "referenced_type" : "type-753"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-752"
+     "referenced_type" : "type-756"
     },
     {
-     "referenced_type" : "type-753"
+     "referenced_type" : "type-757"
     },
     {
      "default_arg" : true,
@@ -7551,16 +7560,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-768"
+     "referenced_type" : "type-772"
     }
    ],
-   "return_type" : "type-813",
+   "return_type" : "type-817",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
   {
    "function_name" : "android::IAAudioService::getDefaultImpl",
    "linker_set_key" : "_ZN7android14IAAudioService14getDefaultImplEv",
-   "return_type" : "type-773",
+   "return_type" : "type-777",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
   {
@@ -7569,7 +7578,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-814"
+     "referenced_type" : "type-818"
     }
    ],
    "return_type" : "type-16",
@@ -7582,7 +7591,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-772"
+     "referenced_type" : "type-776"
     }
    ],
    "return_type" : "type-54",
@@ -7595,7 +7604,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-772"
+     "referenced_type" : "type-776"
     }
    ],
    "return_type" : "type-54",
@@ -7608,7 +7617,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-772"
+     "referenced_type" : "type-776"
     }
    ],
    "return_type" : "type-54",
@@ -7621,7 +7630,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-772"
+     "referenced_type" : "type-776"
     }
    ],
    "return_type" : "type-54",
@@ -7634,16 +7643,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-780"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-783"
     },
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-784"
     },
     {
      "default_arg" : true,
@@ -8204,7 +8213,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-816"
+     "referenced_type" : "type-515"
     },
     {
      "referenced_type" : "type-8"
@@ -8223,7 +8232,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-816"
+     "referenced_type" : "type-515"
     },
     {
      "referenced_type" : "type-4"
@@ -8239,7 +8248,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-816"
+     "referenced_type" : "type-515"
     },
     {
      "referenced_type" : "type-4"
@@ -8255,7 +8264,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-816"
+     "referenced_type" : "type-515"
     }
    ],
    "return_type" : "type-54",
@@ -8268,7 +8277,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-816"
+     "referenced_type" : "type-515"
     }
    ],
    "return_type" : "type-54",
@@ -8281,7 +8290,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-816"
+     "referenced_type" : "type-515"
     }
    ],
    "return_type" : "type-54",
@@ -8294,7 +8303,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-819"
+     "referenced_type" : "type-518"
     },
     {
      "referenced_type" : "type-53"
@@ -8313,7 +8322,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-819"
+     "referenced_type" : "type-518"
     },
     {
      "referenced_type" : "type-4"
@@ -8329,7 +8338,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-819"
+     "referenced_type" : "type-518"
     },
     {
      "referenced_type" : "type-4"
@@ -8345,7 +8354,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-520"
     },
     {
      "referenced_type" : "type-53"
@@ -8364,7 +8373,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-520"
     },
     {
      "referenced_type" : "type-4"
@@ -8380,7 +8389,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-520"
     },
     {
      "referenced_type" : "type-4"
@@ -8413,7 +8422,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-818"
+     "referenced_type" : "type-517"
     },
     {
      "referenced_type" : "type-53"
@@ -8432,7 +8441,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-818"
+     "referenced_type" : "type-517"
     },
     {
      "referenced_type" : "type-4"
@@ -8448,7 +8457,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-818"
+     "referenced_type" : "type-517"
     },
     {
      "referenced_type" : "type-4"
@@ -8751,7 +8760,7 @@
      "referenced_type" : "type-155"
     },
     {
-     "referenced_type" : "type-720"
+     "referenced_type" : "type-725"
     }
    ],
    "return_type" : "type-4",
@@ -8843,10 +8852,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-784"
+     "referenced_type" : "type-788"
     },
     {
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-789"
     }
    ],
    "return_type" : "type-4",
@@ -8860,7 +8869,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-784"
+     "referenced_type" : "type-788"
     }
    ],
    "return_type" : "type-4",
@@ -8912,6 +8921,20 @@
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
   },
   {
+   "access" : "private",
+   "function_name" : "aaudio::IsochronousClockModel::getLateTimeOffsetNanos",
+   "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel22getLateTimeOffsetNanosEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-192"
+    }
+   ],
+   "return_type" : "type-4",
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
+  },
+  {
    "function_name" : "aaudio::IsochronousClockModel::convertDeltaPositionToTime",
    "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel26convertDeltaPositionToTimeEl",
    "parameters" :
@@ -8944,6 +8967,38 @@
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
   },
   {
+   "function_name" : "aaudio::IsochronousClockModel::convertLatestTimeToPosition",
+   "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel27convertLatestTimeToPositionEl",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-192"
+    },
+    {
+     "referenced_type" : "type-8"
+    }
+   ],
+   "return_type" : "type-8",
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
+  },
+  {
+   "function_name" : "aaudio::IsochronousClockModel::convertPositionToLatestTime",
+   "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel27convertPositionToLatestTimeEl",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-192"
+    },
+    {
+     "referenced_type" : "type-8"
+    }
+   ],
+   "return_type" : "type-8",
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
+  },
+  {
    "function_name" : "aaudio::IsochronousClockModel::dump",
    "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel4dumpEv",
    "parameters" :
@@ -9002,10 +9057,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-796"
+     "referenced_type" : "type-800"
     },
     {
-     "referenced_type" : "type-797"
+     "referenced_type" : "type-801"
     }
    ],
    "return_type" : "type-4",
@@ -9019,7 +9074,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-796"
+     "referenced_type" : "type-800"
     }
    ],
    "return_type" : "type-4",
@@ -9032,10 +9087,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-804"
+     "referenced_type" : "type-808"
     },
     {
-     "referenced_type" : "type-805"
+     "referenced_type" : "type-809"
     }
    ],
    "return_type" : "type-4",
@@ -9049,7 +9104,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-804"
+     "referenced_type" : "type-808"
     }
    ],
    "return_type" : "type-4",
@@ -9092,10 +9147,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-731"
     },
     {
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-732"
     }
    ],
    "return_type" : "type-4",
@@ -9108,10 +9163,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-742"
+     "referenced_type" : "type-746"
     }
    ],
-   "return_type" : "type-740",
+   "return_type" : "type-744",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
   {
@@ -9121,10 +9176,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-771"
+     "referenced_type" : "type-775"
     }
    ],
-   "return_type" : "type-769",
+   "return_type" : "type-773",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
   {
@@ -9153,10 +9208,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-730"
     },
     {
-     "referenced_type" : "type-732"
+     "referenced_type" : "type-738"
     }
    ],
    "return_type" : "type-4",
@@ -9169,10 +9224,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-731"
     },
     {
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-732"
     }
    ],
    "return_type" : "type-4",
@@ -9185,16 +9240,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-747"
+     "referenced_type" : "type-753"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-752"
+     "referenced_type" : "type-756"
     },
     {
-     "referenced_type" : "type-753"
+     "referenced_type" : "type-757"
     },
     {
      "default_arg" : true,
@@ -9211,16 +9266,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-780"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-783"
     },
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-784"
     },
     {
      "default_arg" : true,
@@ -9365,8 +9420,8 @@
    "alignment" : 8,
    "linker_set_key" : "const aaudio::AudioStreamBuilder &",
    "name" : "const aaudio::AudioStreamBuilder &",
-   "referenced_type" : "type-684",
-   "self_type" : "type-686",
+   "referenced_type" : "type-688",
+   "self_type" : "type-690",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
@@ -9411,7 +9466,7 @@
    "linker_set_key" : "const android::AudioClient &",
    "name" : "const android::AudioClient &",
    "referenced_type" : "type-1196",
-   "self_type" : "type-1198",
+   "self_type" : "type-1199",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9482,8 +9537,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AudioClient &",
    "name" : "const android::AudioClient &",
-   "referenced_type" : "type-580",
-   "self_type" : "type-582",
+   "referenced_type" : "type-584",
+   "self_type" : "type-586",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9491,8 +9546,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AudioClient &",
    "name" : "const android::AudioClient &",
-   "referenced_type" : "type-655",
-   "self_type" : "type-657",
+   "referenced_type" : "type-659",
+   "self_type" : "type-661",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
@@ -9500,8 +9555,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AudioClient &",
    "name" : "const android::AudioClient &",
-   "referenced_type" : "type-714",
-   "self_type" : "type-716",
+   "referenced_type" : "type-718",
+   "self_type" : "type-720",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9509,8 +9564,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AudioClient &",
    "name" : "const android::AudioClient &",
-   "referenced_type" : "type-758",
-   "self_type" : "type-760",
+   "referenced_type" : "type-762",
+   "self_type" : "type-764",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9572,8 +9627,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-750",
-   "self_type" : "type-752",
+   "referenced_type" : "type-754",
+   "self_type" : "type-756",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -9581,8 +9636,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-777",
-   "self_type" : "type-779",
+   "referenced_type" : "type-781",
+   "self_type" : "type-783",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -9626,8 +9681,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-735",
-   "self_type" : "type-740",
+   "referenced_type" : "type-739",
+   "self_type" : "type-744",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -9635,8 +9690,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-764",
-   "self_type" : "type-769",
+   "referenced_type" : "type-768",
+   "self_type" : "type-773",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -9680,8 +9735,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "referenced_type" : "type-694",
-   "self_type" : "type-696",
+   "referenced_type" : "type-698",
+   "self_type" : "type-700",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -9689,8 +9744,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "referenced_type" : "type-792",
-   "self_type" : "type-794",
+   "referenced_type" : "type-796",
+   "self_type" : "type-798",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -9788,8 +9843,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-577",
-   "self_type" : "type-579",
+   "referenced_type" : "type-581",
+   "self_type" : "type-583",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9797,8 +9852,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-709",
-   "self_type" : "type-711",
+   "referenced_type" : "type-713",
+   "self_type" : "type-715",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9806,8 +9861,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-755",
-   "self_type" : "type-757",
+   "referenced_type" : "type-759",
+   "self_type" : "type-761",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9860,8 +9915,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IBinder> &",
    "name" : "const android::sp<android::IBinder> &",
-   "referenced_type" : "type-737",
-   "self_type" : "type-739",
+   "referenced_type" : "type-741",
+   "self_type" : "type-743",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -9869,8 +9924,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IBinder> &",
    "name" : "const android::sp<android::IBinder> &",
-   "referenced_type" : "type-766",
-   "self_type" : "type-768",
+   "referenced_type" : "type-770",
+   "self_type" : "type-772",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -9959,8 +10014,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-586",
-   "self_type" : "type-588",
+   "referenced_type" : "type-590",
+   "self_type" : "type-592",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9968,8 +10023,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-717",
-   "self_type" : "type-719",
+   "referenced_type" : "type-721",
+   "self_type" : "type-723",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9977,8 +10032,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-761",
-   "self_type" : "type-763",
+   "referenced_type" : "type-765",
+   "self_type" : "type-767",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10013,8 +10068,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> > &",
    "name" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> > &",
-   "referenced_type" : "type-745",
-   "self_type" : "type-744",
+   "referenced_type" : "type-749",
+   "self_type" : "type-748",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -10040,8 +10095,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> > &",
    "name" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> > &",
-   "referenced_type" : "type-774",
-   "self_type" : "type-773",
+   "referenced_type" : "type-778",
+   "self_type" : "type-777",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -10106,8 +10161,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamBuilderStruct *",
    "name" : "AAudioStreamBuilderStruct *",
-   "referenced_type" : "type-603",
-   "self_type" : "type-602",
+   "referenced_type" : "type-607",
+   "self_type" : "type-606",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10160,8 +10215,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamBuilderStruct **",
    "name" : "AAudioStreamBuilderStruct **",
-   "referenced_type" : "type-602",
-   "self_type" : "type-606",
+   "referenced_type" : "type-606",
+   "self_type" : "type-610",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10178,8 +10233,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1053",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1052",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10457,8 +10512,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-597",
-   "self_type" : "type-596",
+   "referenced_type" : "type-601",
+   "self_type" : "type-600",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10466,8 +10521,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-601",
-   "self_type" : "type-600",
+   "referenced_type" : "type-605",
+   "self_type" : "type-604",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10475,8 +10530,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-613",
-   "self_type" : "type-612",
+   "referenced_type" : "type-617",
+   "self_type" : "type-616",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10484,8 +10539,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-623",
-   "self_type" : "type-622",
+   "referenced_type" : "type-627",
+   "self_type" : "type-626",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10493,8 +10548,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-630",
-   "self_type" : "type-629",
+   "referenced_type" : "type-634",
+   "self_type" : "type-633",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10502,8 +10557,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-670",
-   "self_type" : "type-669",
+   "referenced_type" : "type-674",
+   "self_type" : "type-673",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10511,8 +10566,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-677",
-   "self_type" : "type-676",
+   "referenced_type" : "type-681",
+   "self_type" : "type-680",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10520,8 +10575,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-682",
-   "self_type" : "type-681",
+   "referenced_type" : "type-686",
+   "self_type" : "type-685",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10529,8 +10584,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-749",
-   "self_type" : "type-748",
+   "referenced_type" : "type-752",
+   "self_type" : "type-751",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10646,8 +10701,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct **",
    "name" : "AAudioStreamStruct **",
-   "referenced_type" : "type-596",
-   "self_type" : "type-599",
+   "referenced_type" : "type-600",
+   "self_type" : "type-603",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10773,7 +10828,7 @@
    "linker_set_key" : "aaudio::AAudioStreamConfiguration *",
    "name" : "aaudio::AAudioStreamConfiguration *",
    "referenced_type" : "type-149",
-   "self_type" : "type-726",
+   "self_type" : "type-730",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -10809,7 +10864,7 @@
    "linker_set_key" : "aaudio::AudioEndpointParcelable *",
    "name" : "aaudio::AudioEndpointParcelable *",
    "referenced_type" : "type-28",
-   "self_type" : "type-480",
+   "self_type" : "type-481",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -10935,7 +10990,7 @@
    "linker_set_key" : "aaudio::RingBufferDescriptor_s *",
    "name" : "aaudio::RingBufferDescriptor_s *",
    "referenced_type" : "type-40",
-   "self_type" : "type-791",
+   "self_type" : "type-795",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -10944,7 +10999,7 @@
    "linker_set_key" : "aaudio::RingBufferParcelable *",
    "name" : "aaudio::RingBufferParcelable *",
    "referenced_type" : "type-29",
-   "self_type" : "type-782",
+   "self_type" : "type-786",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -10953,7 +11008,7 @@
    "linker_set_key" : "aaudio::SharedMemoryParcelable *",
    "name" : "aaudio::SharedMemoryParcelable *",
    "referenced_type" : "type-35",
-   "self_type" : "type-790",
+   "self_type" : "type-794",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -10962,7 +11017,7 @@
    "linker_set_key" : "aaudio::SharedRegionParcelable *",
    "name" : "aaudio::SharedRegionParcelable *",
    "referenced_type" : "type-30",
-   "self_type" : "type-802",
+   "self_type" : "type-806",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -10971,7 +11026,7 @@
    "linker_set_key" : "android::BnAAudioClient *",
    "name" : "android::BnAAudioClient *",
    "referenced_type" : "type-164",
-   "self_type" : "type-747",
+   "self_type" : "type-753",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -10980,7 +11035,7 @@
    "linker_set_key" : "android::BnAAudioService *",
    "name" : "android::BnAAudioService *",
    "referenced_type" : "type-169",
-   "self_type" : "type-776",
+   "self_type" : "type-780",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -11024,8 +11079,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ExtendedTimestamp *",
    "name" : "android::ExtendedTimestamp *",
-   "referenced_type" : "type-619",
-   "self_type" : "type-618",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -11079,7 +11134,7 @@
    "linker_set_key" : "android::IAAudioClient *",
    "name" : "android::IAAudioClient *",
    "referenced_type" : "type-160",
-   "self_type" : "type-743",
+   "self_type" : "type-747",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -11088,7 +11143,7 @@
    "linker_set_key" : "android::IAAudioService *",
    "name" : "android::IAAudioService *",
    "referenced_type" : "type-167",
-   "self_type" : "type-772",
+   "self_type" : "type-776",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -11105,8 +11160,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1026",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -11195,8 +11250,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1189",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1191",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -11249,8 +11304,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-700",
-   "self_type" : "type-699",
+   "referenced_type" : "type-704",
+   "self_type" : "type-703",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -11258,8 +11313,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-721",
-   "self_type" : "type-720",
+   "referenced_type" : "type-726",
+   "self_type" : "type-725",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -11267,8 +11322,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-729",
-   "self_type" : "type-728",
+   "referenced_type" : "type-733",
+   "self_type" : "type-732",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -11276,8 +11331,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-754",
-   "self_type" : "type-753",
+   "referenced_type" : "type-758",
+   "self_type" : "type-757",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -11285,8 +11340,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-781",
-   "self_type" : "type-780",
+   "referenced_type" : "type-785",
+   "self_type" : "type-784",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -11294,8 +11349,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-786",
-   "self_type" : "type-785",
+   "referenced_type" : "type-790",
+   "self_type" : "type-789",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11303,8 +11358,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-798",
-   "self_type" : "type-797",
+   "referenced_type" : "type-802",
+   "self_type" : "type-801",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -11312,8 +11367,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-806",
-   "self_type" : "type-805",
+   "referenced_type" : "type-810",
+   "self_type" : "type-809",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -11358,7 +11413,7 @@
    "linker_set_key" : "const aaudio::AAudioStreamConfiguration *",
    "name" : "const aaudio::AAudioStreamConfiguration *",
    "referenced_type" : "type-158",
-   "self_type" : "type-727",
+   "self_type" : "type-731",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -11483,8 +11538,8 @@
    "alignment" : 8,
    "linker_set_key" : "const aaudio::RingBufferParcelable *",
    "name" : "const aaudio::RingBufferParcelable *",
-   "referenced_type" : "type-783",
-   "self_type" : "type-784",
+   "referenced_type" : "type-787",
+   "self_type" : "type-788",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11492,8 +11547,8 @@
    "alignment" : 8,
    "linker_set_key" : "const aaudio::SharedMemoryParcelable *",
    "name" : "const aaudio::SharedMemoryParcelable *",
-   "referenced_type" : "type-795",
-   "self_type" : "type-796",
+   "referenced_type" : "type-799",
+   "self_type" : "type-800",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -11501,8 +11556,8 @@
    "alignment" : 8,
    "linker_set_key" : "const aaudio::SharedRegionParcelable *",
    "name" : "const aaudio::SharedRegionParcelable *",
-   "referenced_type" : "type-803",
-   "self_type" : "type-804",
+   "referenced_type" : "type-807",
+   "self_type" : "type-808",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -11519,8 +11574,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IAAudioClient *",
    "name" : "const android::IAAudioClient *",
-   "referenced_type" : "type-741",
-   "self_type" : "type-742",
+   "referenced_type" : "type-745",
+   "self_type" : "type-746",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -11528,8 +11583,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IAAudioService *",
    "name" : "const android::IAAudioService *",
-   "referenced_type" : "type-770",
-   "self_type" : "type-771",
+   "referenced_type" : "type-774",
+   "self_type" : "type-775",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -11556,7 +11611,7 @@
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
    "referenced_type" : "type-1035",
-   "self_type" : "type-1037",
+   "self_type" : "type-1039",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -11654,8 +11709,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-701",
-   "self_type" : "type-703",
+   "referenced_type" : "type-705",
+   "self_type" : "type-707",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -11663,8 +11718,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-723",
-   "self_type" : "type-725",
+   "referenced_type" : "type-727",
+   "self_type" : "type-729",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -11672,8 +11727,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-730",
-   "self_type" : "type-732",
+   "referenced_type" : "type-734",
+   "self_type" : "type-738",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -11681,8 +11736,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-787",
-   "self_type" : "type-789",
+   "referenced_type" : "type-791",
+   "self_type" : "type-793",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11690,8 +11745,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-799",
-   "self_type" : "type-801",
+   "referenced_type" : "type-803",
+   "self_type" : "type-805",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -11699,8 +11754,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-807",
-   "self_type" : "type-809",
+   "referenced_type" : "type-811",
+   "self_type" : "type-813",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -11844,7 +11899,7 @@
    "linker_set_key" : "flowgraph::MonoToMultiConverter *",
    "name" : "flowgraph::MonoToMultiConverter *",
    "referenced_type" : "type-99",
-   "self_type" : "type-816",
+   "self_type" : "type-515",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/MonoToMultiConverter.h"
   },
@@ -11862,7 +11917,7 @@
    "linker_set_key" : "flowgraph::SinkFloat *",
    "name" : "flowgraph::SinkFloat *",
    "referenced_type" : "type-263",
-   "self_type" : "type-818",
+   "self_type" : "type-517",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/SinkFloat.h"
   },
@@ -11871,7 +11926,7 @@
    "linker_set_key" : "flowgraph::SinkI16 *",
    "name" : "flowgraph::SinkI16 *",
    "referenced_type" : "type-264",
-   "self_type" : "type-819",
+   "self_type" : "type-518",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/SinkI16.h"
   },
@@ -11880,7 +11935,7 @@
    "linker_set_key" : "flowgraph::SinkI24 *",
    "name" : "flowgraph::SinkI24 *",
    "referenced_type" : "type-265",
-   "self_type" : "type-821",
+   "self_type" : "type-520",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/SinkI24.h"
   },
@@ -11969,8 +12024,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::atomic<long> *",
    "name" : "std::atomic<long> *",
-   "referenced_type" : "type-639",
-   "self_type" : "type-638",
+   "referenced_type" : "type-643",
+   "self_type" : "type-642",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/fifo/FifoControllerIndirect.h"
   },
@@ -12160,8 +12215,8 @@
    "is_const" : true,
    "linker_set_key" : "const aaudio::AudioStreamBuilder",
    "name" : "const aaudio::AudioStreamBuilder",
-   "referenced_type" : "type-685",
-   "self_type" : "type-684",
+   "referenced_type" : "type-689",
+   "self_type" : "type-688",
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
   {
@@ -12179,7 +12234,7 @@
    "name" : "const aaudio::AudioStreamInternal",
    "referenced_type" : "type-6",
    "self_type" : "type-64",
-   "size" : 1712,
+   "size" : 1720,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
   {
@@ -12189,7 +12244,7 @@
    "name" : "const aaudio::AudioStreamInternalCapture",
    "referenced_type" : "type-67",
    "self_type" : "type-69",
-   "size" : 1720,
+   "size" : 1728,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalCapture.h"
   },
   {
@@ -12199,7 +12254,7 @@
    "name" : "const aaudio::AudioStreamInternalPlay",
    "referenced_type" : "type-111",
    "self_type" : "type-113",
-   "size" : 1760,
+   "size" : 1768,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
   {
@@ -12239,7 +12294,7 @@
    "name" : "const aaudio::IsochronousClockModel",
    "referenced_type" : "type-7",
    "self_type" : "type-191",
-   "size" : 40,
+   "size" : 48,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
   },
   {
@@ -12248,7 +12303,7 @@
    "linker_set_key" : "const aaudio::RingBufferParcelable",
    "name" : "const aaudio::RingBufferParcelable",
    "referenced_type" : "type-29",
-   "self_type" : "type-783",
+   "self_type" : "type-787",
    "size" : 96,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -12258,7 +12313,7 @@
    "linker_set_key" : "const aaudio::SharedMemoryParcelable",
    "name" : "const aaudio::SharedMemoryParcelable",
    "referenced_type" : "type-35",
-   "self_type" : "type-795",
+   "self_type" : "type-799",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -12268,7 +12323,7 @@
    "linker_set_key" : "const aaudio::SharedRegionParcelable",
    "name" : "const aaudio::SharedRegionParcelable",
    "referenced_type" : "type-30",
-   "self_type" : "type-803",
+   "self_type" : "type-807",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -12387,8 +12442,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-581",
-   "self_type" : "type-580",
+   "referenced_type" : "type-585",
+   "self_type" : "type-584",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -12397,8 +12452,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-656",
-   "self_type" : "type-655",
+   "referenced_type" : "type-660",
+   "self_type" : "type-659",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
@@ -12407,8 +12462,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-715",
-   "self_type" : "type-714",
+   "referenced_type" : "type-719",
+   "self_type" : "type-718",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -12417,8 +12472,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-759",
-   "self_type" : "type-758",
+   "referenced_type" : "type-763",
+   "self_type" : "type-762",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -12458,7 +12513,7 @@
    "linker_set_key" : "const android::IAAudioClient",
    "name" : "const android::IAAudioClient",
    "referenced_type" : "type-160",
-   "self_type" : "type-741",
+   "self_type" : "type-745",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12468,7 +12523,7 @@
    "linker_set_key" : "const android::IAAudioService",
    "name" : "const android::IAAudioService",
    "referenced_type" : "type-167",
-   "self_type" : "type-770",
+   "self_type" : "type-774",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -12647,8 +12702,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-702",
-   "self_type" : "type-701",
+   "referenced_type" : "type-706",
+   "self_type" : "type-705",
    "size" : 120,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -12657,8 +12712,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-724",
-   "self_type" : "type-723",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
    "size" : 120,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -12667,8 +12722,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-731",
-   "self_type" : "type-730",
+   "referenced_type" : "type-735",
+   "self_type" : "type-734",
    "size" : 120,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -12677,8 +12732,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-751",
-   "self_type" : "type-750",
+   "referenced_type" : "type-755",
+   "self_type" : "type-754",
    "size" : 120,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12687,8 +12742,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-778",
-   "self_type" : "type-777",
+   "referenced_type" : "type-782",
+   "self_type" : "type-781",
    "size" : 120,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -12697,8 +12752,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-788",
-   "self_type" : "type-787",
+   "referenced_type" : "type-792",
+   "self_type" : "type-791",
    "size" : 120,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -12707,8 +12762,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-800",
-   "self_type" : "type-799",
+   "referenced_type" : "type-804",
+   "self_type" : "type-803",
    "size" : 120,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -12717,8 +12772,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-808",
-   "self_type" : "type-807",
+   "referenced_type" : "type-812",
+   "self_type" : "type-811",
    "size" : 120,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -12937,8 +12992,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-574",
-   "self_type" : "type-573",
+   "referenced_type" : "type-578",
+   "self_type" : "type-577",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12947,8 +13002,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-608",
-   "self_type" : "type-607",
+   "referenced_type" : "type-612",
+   "self_type" : "type-611",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12957,8 +13012,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-665",
-   "self_type" : "type-664",
+   "referenced_type" : "type-669",
+   "self_type" : "type-668",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12967,8 +13022,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-673",
-   "self_type" : "type-672",
+   "referenced_type" : "type-677",
+   "self_type" : "type-676",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12977,8 +13032,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-689",
-   "self_type" : "type-688",
+   "referenced_type" : "type-693",
+   "self_type" : "type-692",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12987,8 +13042,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-706",
-   "self_type" : "type-705",
+   "referenced_type" : "type-710",
+   "self_type" : "type-709",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12997,8 +13052,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-736",
-   "self_type" : "type-735",
+   "referenced_type" : "type-740",
+   "self_type" : "type-739",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13007,8 +13062,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-765",
-   "self_type" : "type-764",
+   "referenced_type" : "type-769",
+   "self_type" : "type-768",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13117,8 +13172,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-695",
-   "self_type" : "type-694",
+   "referenced_type" : "type-699",
+   "self_type" : "type-698",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -13127,8 +13182,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-793",
-   "self_type" : "type-792",
+   "referenced_type" : "type-797",
+   "self_type" : "type-796",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -13137,8 +13192,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-1039",
-   "self_type" : "type-1038",
+   "referenced_type" : "type-1038",
+   "self_type" : "type-1037",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13447,8 +13502,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-584",
-   "self_type" : "type-583",
+   "referenced_type" : "type-588",
+   "self_type" : "type-587",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13457,8 +13512,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-605",
-   "self_type" : "type-604",
+   "referenced_type" : "type-609",
+   "self_type" : "type-608",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13467,8 +13522,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-611",
-   "self_type" : "type-610",
+   "referenced_type" : "type-615",
+   "self_type" : "type-614",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13477,8 +13532,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-621",
-   "self_type" : "type-620",
+   "referenced_type" : "type-625",
+   "self_type" : "type-624",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13487,8 +13542,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-628",
-   "self_type" : "type-627",
+   "referenced_type" : "type-632",
+   "self_type" : "type-631",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13497,8 +13552,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-668",
-   "self_type" : "type-667",
+   "referenced_type" : "type-672",
+   "self_type" : "type-671",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13507,8 +13562,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
+   "referenced_type" : "type-679",
+   "self_type" : "type-678",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13517,8 +13572,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-680",
-   "self_type" : "type-679",
+   "referenced_type" : "type-684",
+   "self_type" : "type-683",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13527,8 +13582,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-734",
-   "self_type" : "type-733",
+   "referenced_type" : "type-737",
+   "self_type" : "type-736",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13777,8 +13832,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-554",
-   "self_type" : "type-553",
+   "referenced_type" : "type-558",
+   "self_type" : "type-557",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -13787,8 +13842,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-616",
-   "self_type" : "type-615",
+   "referenced_type" : "type-620",
+   "self_type" : "type-619",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -13797,8 +13852,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-626",
-   "self_type" : "type-625",
+   "referenced_type" : "type-630",
+   "self_type" : "type-629",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -13807,8 +13862,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-633",
-   "self_type" : "type-632",
+   "referenced_type" : "type-637",
+   "self_type" : "type-636",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -13938,8 +13993,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioClient>",
    "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-578",
-   "self_type" : "type-577",
+   "referenced_type" : "type-582",
+   "self_type" : "type-581",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
@@ -13947,8 +14002,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioClient>",
    "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-710",
-   "self_type" : "type-709",
+   "referenced_type" : "type-714",
+   "self_type" : "type-713",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -13957,8 +14012,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioClient>",
    "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-756",
-   "self_type" : "type-755",
+   "referenced_type" : "type-760",
+   "self_type" : "type-759",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -14005,8 +14060,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioService>",
    "name" : "const android::sp<android::IAAudioService>",
-   "referenced_type" : "type-708",
-   "self_type" : "type-707",
+   "referenced_type" : "type-712",
+   "self_type" : "type-711",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -14055,8 +14110,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IBinder>",
    "name" : "const android::sp<android::IBinder>",
-   "referenced_type" : "type-738",
-   "self_type" : "type-737",
+   "referenced_type" : "type-742",
+   "self_type" : "type-741",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -14065,8 +14120,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IBinder>",
    "name" : "const android::sp<android::IBinder>",
-   "referenced_type" : "type-767",
-   "self_type" : "type-766",
+   "referenced_type" : "type-771",
+   "self_type" : "type-770",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -14146,24 +14201,24 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-587",
-   "self_type" : "type-586",
+   "referenced_type" : "type-591",
+   "self_type" : "type-590",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-718",
-   "self_type" : "type-717",
+   "referenced_type" : "type-722",
+   "self_type" : "type-721",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-762",
-   "self_type" : "type-761",
+   "referenced_type" : "type-766",
+   "self_type" : "type-765",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
@@ -14269,8 +14324,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> >",
    "name" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> >",
-   "referenced_type" : "type-746",
-   "self_type" : "type-745",
+   "referenced_type" : "type-750",
+   "self_type" : "type-749",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -14299,8 +14354,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> >",
    "name" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> >",
-   "referenced_type" : "type-775",
-   "self_type" : "type-774",
+   "referenced_type" : "type-779",
+   "self_type" : "type-778",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -16236,109 +16291,109 @@
     {
      "access" : "protected",
      "field_name" : "mAudioEndpoint",
-     "field_offset" : 1984,
+     "field_offset" : 2048,
      "referenced_type" : "type-10"
     },
     {
      "access" : "protected",
      "field_name" : "mServiceStreamHandle",
-     "field_offset" : 2368,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mFramesPerBurst",
-     "field_offset" : 2400,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mXRunCount",
      "field_offset" : 2432,
      "referenced_type" : "type-4"
     },
     {
      "access" : "protected",
-     "field_name" : "mFramesOffsetFromService",
+     "field_name" : "mFramesPerBurst",
+     "field_offset" : 2464,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mXRunCount",
      "field_offset" : 2496,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mFramesOffsetFromService",
+     "field_offset" : 2560,
      "referenced_type" : "type-8"
     },
     {
      "access" : "protected",
      "field_name" : "mCallbackBuffer",
-     "field_offset" : 2560,
+     "field_offset" : 2624,
      "referenced_type" : "type-14"
     },
     {
      "access" : "protected",
      "field_name" : "mCallbackFrames",
-     "field_offset" : 2624,
+     "field_offset" : 2688,
      "referenced_type" : "type-4"
     },
     {
      "access" : "protected",
      "field_name" : "mInService",
-     "field_offset" : 2656,
+     "field_offset" : 2720,
      "referenced_type" : "type-16"
     },
     {
      "access" : "protected",
      "field_name" : "mServiceInterface",
-     "field_offset" : 2688,
+     "field_offset" : 2752,
      "referenced_type" : "type-18"
     },
     {
      "access" : "protected",
      "field_name" : "mAtomicInternalTimestamp",
-     "field_offset" : 2752,
+     "field_offset" : 2816,
      "referenced_type" : "type-20"
     },
     {
      "access" : "protected",
      "field_name" : "mNeedCatchUp",
-     "field_offset" : 3072,
+     "field_offset" : 3136,
      "referenced_type" : "type-24"
     },
     {
      "access" : "protected",
      "field_name" : "mStreamVolume",
-     "field_offset" : 3136,
+     "field_offset" : 3200,
      "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mWakeupDelayNanos",
-     "field_offset" : 3168,
+     "field_offset" : 3232,
      "referenced_type" : "type-13"
     },
     {
      "access" : "private",
      "field_name" : "mMinimumSleepNanos",
-     "field_offset" : 3200,
+     "field_offset" : 3264,
      "referenced_type" : "type-13"
     },
     {
      "access" : "private",
      "field_name" : "mEndPointParcelable",
-     "field_offset" : 3264,
+     "field_offset" : 3328,
      "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mEndpointDescriptor",
-     "field_offset" : 12608,
+     "field_offset" : 12672,
      "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mServiceLatencyNanos",
-     "field_offset" : 13568,
+     "field_offset" : 13632,
      "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mDeviceChannelCount",
-     "field_offset" : 13632,
+     "field_offset" : 13696,
      "referenced_type" : "type-4"
     }
    ],
@@ -16347,7 +16402,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-6",
    "self_type" : "type-6",
-   "size" : 1712,
+   "size" : 1720,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h",
    "unique_id" : "_ZTSN6aaudio19AudioStreamInternalE",
    "vtable_components" :
@@ -16484,7 +16539,7 @@
     {
      "access" : "private",
      "field_name" : "mLastFramesWritten",
-     "field_offset" : 13696,
+     "field_offset" : 13760,
      "referenced_type" : "type-8"
     }
    ],
@@ -16493,7 +16548,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-67",
    "self_type" : "type-67",
-   "size" : 1720,
+   "size" : 1728,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalCapture.h",
    "unique_id" : "_ZTSN6aaudio26AudioStreamInternalCaptureE",
    "vtable_components" :
@@ -16624,13 +16679,13 @@
     {
      "access" : "private",
      "field_name" : "mLastFramesRead",
-     "field_offset" : 13696,
+     "field_offset" : 13760,
      "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mFlowGraph",
-     "field_offset" : 13760,
+     "field_offset" : 13824,
      "referenced_type" : "type-105"
     }
    ],
@@ -16639,7 +16694,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-111",
    "self_type" : "type-111",
-   "size" : 1760,
+   "size" : 1768,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h",
    "unique_id" : "_ZTSN6aaudio23AudioStreamInternalPlayE",
    "vtable_components" :
@@ -17436,15 +17491,27 @@
     },
     {
      "access" : "private",
-     "field_name" : "mMaxLatenessInNanos",
+     "field_name" : "mBurstPeriodNanos",
      "field_offset" : 256,
      "referenced_type" : "type-4"
     },
     {
      "access" : "private",
-     "field_name" : "mState",
+     "field_name" : "mMaxMeasuredLatenessNanos",
      "field_offset" : 288,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mState",
+     "field_offset" : 320,
      "referenced_type" : "type-9"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampCount",
+     "field_offset" : 352,
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "aaudio::IsochronousClockModel",
@@ -17452,7 +17519,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-7",
    "self_type" : "type-7",
-   "size" : 40,
+   "size" : 48,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h",
    "unique_id" : "_ZTSN6aaudio21IsochronousClockModelE",
    "vtable_components" :
diff --git a/29/64/arm_armv7-a-neon/source-based/libaaudio.so.lsdump b/29/64/arm_armv7-a-neon/source-based/libaaudio.so.lsdump
index 4eef0c6..71954b8 100644
--- a/29/64/arm_armv7-a-neon/source-based/libaaudio.so.lsdump
+++ b/29/64/arm_armv7-a-neon/source-based/libaaudio.so.lsdump
@@ -98,8 +98,8 @@
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-1131",
-   "self_type" : "type-1131",
+   "referenced_type" : "type-830",
+   "self_type" : "type-830",
    "size" : 8
   },
   {
@@ -116,8 +116,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1130",
+   "referenced_type" : "type-829",
+   "self_type" : "type-829",
    "size" : 2
   },
   {
@@ -146,8 +146,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-1129",
-   "self_type" : "type-1129",
+   "referenced_type" : "type-828",
+   "self_type" : "type-828",
    "size" : 4
   },
   {
@@ -156,8 +156,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-447",
-   "self_type" : "type-447",
+   "referenced_type" : "type-281",
+   "self_type" : "type-281",
    "size" : 8
   },
   {
@@ -166,8 +166,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-1128",
-   "self_type" : "type-1128",
+   "referenced_type" : "type-827",
+   "self_type" : "type-827",
    "size" : 2
   },
   {
@@ -1582,12 +1582,21 @@
    "name" : "_ZNK6aaudio21IsochronousClockModel21convertTimeToPositionEx"
   },
   {
+   "name" : "_ZNK6aaudio21IsochronousClockModel22getLateTimeOffsetNanosEv"
+  },
+  {
    "name" : "_ZNK6aaudio21IsochronousClockModel26convertDeltaPositionToTimeEx"
   },
   {
    "name" : "_ZNK6aaudio21IsochronousClockModel26convertDeltaTimeToPositionEx"
   },
   {
+   "name" : "_ZNK6aaudio21IsochronousClockModel27convertLatestTimeToPositionEx"
+  },
+  {
+   "name" : "_ZNK6aaudio21IsochronousClockModel27convertPositionToLatestTimeEx"
+  },
+  {
    "name" : "_ZNK6aaudio21IsochronousClockModel4dumpEv"
   },
   {
@@ -2299,8 +2308,8 @@
    ],
    "linker_set_key" : "android::aaudio_service_commands_t",
    "name" : "android::aaudio_service_commands_t",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-302",
+   "self_type" : "type-302",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioServiceDefinitions.h",
    "underlying_type" : "type-1",
@@ -3203,7 +3212,7 @@
      "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-432",
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/AAudioUtilities.h"
   },
   {
@@ -3245,7 +3254,7 @@
      "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-285",
+   "return_type" : "type-433",
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/AAudioUtilities.h"
   },
   {
@@ -3275,7 +3284,7 @@
      "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-286",
+   "return_type" : "type-434",
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/AAudioUtilities.h"
   },
   {
@@ -3287,7 +3296,7 @@
      "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-287",
+   "return_type" : "type-435",
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/AAudioUtilities.h"
   },
   {
@@ -3299,7 +3308,7 @@
      "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-288",
+   "return_type" : "type-436",
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/AAudioUtilities.h"
   },
   {
@@ -3308,7 +3317,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-437"
     }
    ],
    "return_type" : "type-4",
@@ -3396,13 +3405,13 @@
      "referenced_type" : "type-261"
     },
     {
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-438"
     },
     {
      "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-439"
     },
     {
      "referenced_type" : "type-4"
@@ -3687,7 +3696,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-273"
     }
    ],
    "return_type" : "type-54",
@@ -3700,7 +3709,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-273"
     }
    ],
    "return_type" : "type-54",
@@ -3713,7 +3722,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-273"
     }
    ],
    "return_type" : "type-54",
@@ -3726,7 +3735,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-273"
     },
     {
      "referenced_type" : "type-117"
@@ -3742,7 +3751,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-273"
     },
     {
      "referenced_type" : "type-117"
@@ -3758,7 +3767,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-273"
     }
    ],
    "return_type" : "type-54",
@@ -3771,7 +3780,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-273"
     }
    ],
    "return_type" : "type-54",
@@ -3784,7 +3793,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-273"
     }
    ],
    "return_type" : "type-54",
@@ -4056,10 +4065,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-270"
     },
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "type-274"
     }
    ],
    "return_type" : "type-4",
@@ -4072,7 +4081,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-270"
     }
    ],
    "return_type" : "type-54",
@@ -4085,7 +4094,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-270"
     },
     {
      "referenced_type" : "type-4"
@@ -4101,7 +4110,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-270"
     },
     {
      "referenced_type" : "type-4"
@@ -4117,7 +4126,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-270"
     }
    ],
    "return_type" : "type-8",
@@ -4130,7 +4139,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-270"
     },
     {
      "referenced_type" : "type-8"
@@ -4146,7 +4155,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-270"
     }
    ],
    "return_type" : "type-8",
@@ -4159,7 +4168,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-270"
     },
     {
      "referenced_type" : "type-8"
@@ -4175,7 +4184,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-270"
     },
     {
      "referenced_type" : "type-4"
@@ -4194,7 +4203,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-270"
     },
     {
      "referenced_type" : "type-254"
@@ -4210,7 +4219,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-270"
     }
    ],
    "return_type" : "type-4",
@@ -4223,7 +4232,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-270"
     },
     {
      "referenced_type" : "type-254"
@@ -4239,7 +4248,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-270"
     }
    ],
    "return_type" : "type-4",
@@ -4252,10 +4261,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-270"
     },
     {
-     "referenced_type" : "type-438"
+     "referenced_type" : "type-272"
     },
     {
      "referenced_type" : "type-4"
@@ -4271,7 +4280,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-270"
     }
    ],
    "return_type" : "type-54",
@@ -4284,7 +4293,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-270"
     }
    ],
    "return_type" : "type-54",
@@ -4297,7 +4306,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-270"
     }
    ],
    "return_type" : "type-54",
@@ -4310,7 +4319,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-270"
     }
    ],
    "return_type" : "type-54",
@@ -4323,7 +4332,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-270"
     }
    ],
    "return_type" : "type-54",
@@ -5047,7 +5056,7 @@
      "referenced_type" : "type-178"
     },
     {
-     "referenced_type" : "type-501"
+     "referenced_type" : "type-335"
     },
     {
      "referenced_type" : "type-160"
@@ -5146,7 +5155,7 @@
      "referenced_type" : "type-178"
     }
    ],
-   "return_type" : "type-496",
+   "return_type" : "type-330",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
@@ -5197,7 +5206,7 @@
      "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-502"
+     "referenced_type" : "type-336"
     }
    ],
    "return_type" : "type-4",
@@ -5294,7 +5303,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-276"
     },
     {
      "referenced_type" : "type-116"
@@ -5310,7 +5319,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-276"
     }
    ],
    "return_type" : "type-54",
@@ -5323,7 +5332,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-276"
     }
    ],
    "return_type" : "type-54",
@@ -5336,7 +5345,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-276"
     }
    ],
    "return_type" : "type-54",
@@ -5349,7 +5358,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-276"
     }
    ],
    "return_type" : "type-54",
@@ -5362,7 +5371,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-276"
     }
    ],
    "return_type" : "type-54",
@@ -5378,7 +5387,7 @@
      "referenced_type" : "type-157"
     },
     {
-     "referenced_type" : "type-725"
+     "referenced_type" : "type-347"
     }
    ],
    "return_type" : "type-4",
@@ -5527,7 +5536,7 @@
      "referenced_type" : "type-67"
     },
     {
-     "referenced_type" : "type-445"
+     "referenced_type" : "type-279"
     },
     {
      "referenced_type" : "type-246"
@@ -5569,7 +5578,7 @@
      "referenced_type" : "type-67"
     },
     {
-     "referenced_type" : "type-446"
+     "referenced_type" : "type-280"
     }
    ],
    "return_type" : "type-54",
@@ -5656,7 +5665,7 @@
      "referenced_type" : "type-67"
     },
     {
-     "referenced_type" : "type-447"
+     "referenced_type" : "type-281"
     },
     {
      "referenced_type" : "type-8"
@@ -5689,7 +5698,7 @@
      "referenced_type" : "type-67"
     },
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "type-274"
     }
    ],
    "return_type" : "type-4",
@@ -5706,7 +5715,7 @@
      "referenced_type" : "type-67"
     },
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "type-274"
     }
    ],
    "return_type" : "type-4",
@@ -5736,7 +5745,7 @@
      "referenced_type" : "type-67"
     },
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "type-274"
     }
    ],
    "return_type" : "type-4",
@@ -5880,7 +5889,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-404"
     },
     {
      "referenced_type" : "type-4"
@@ -5902,7 +5911,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-404"
     },
     {
      "referenced_type" : "type-4"
@@ -5933,10 +5942,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-404"
     },
     {
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-411"
     }
    ],
    "return_type" : "type-4",
@@ -5949,7 +5958,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-404"
     }
    ],
    "return_type" : "type-4",
@@ -5962,7 +5971,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-404"
     },
     {
      "referenced_type" : "type-4"
@@ -5978,7 +5987,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-404"
     }
    ],
    "return_type" : "type-4",
@@ -5991,7 +6000,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-404"
     },
     {
      "referenced_type" : "type-4"
@@ -6007,7 +6016,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-404"
     }
    ],
    "return_type" : "type-4",
@@ -6020,7 +6029,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-404"
     },
     {
      "referenced_type" : "type-4"
@@ -6036,7 +6045,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-404"
     }
    ],
    "return_type" : "type-54",
@@ -6049,13 +6058,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-404"
     },
     {
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-792"
+     "referenced_type" : "type-413"
     }
    ],
    "return_type" : "type-4",
@@ -6068,7 +6077,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-404"
     }
    ],
    "return_type" : "type-54",
@@ -6081,7 +6090,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-404"
     }
    ],
    "return_type" : "type-54",
@@ -6094,7 +6103,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-404"
     }
    ],
    "return_type" : "type-54",
@@ -6107,7 +6116,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-404"
     }
    ],
    "return_type" : "type-54",
@@ -6120,7 +6129,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-404"
     }
    ],
    "return_type" : "type-54",
@@ -6133,7 +6142,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-479"
+     "referenced_type" : "type-313"
     },
     {
      "referenced_type" : "type-4"
@@ -6149,7 +6158,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-479"
+     "referenced_type" : "type-313"
     },
     {
      "referenced_type" : "type-8"
@@ -6168,7 +6177,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-479"
+     "referenced_type" : "type-313"
     },
     {
      "referenced_type" : "type-4"
@@ -6184,7 +6193,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-479"
+     "referenced_type" : "type-313"
     },
     {
      "referenced_type" : "type-8"
@@ -6203,7 +6212,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-479"
+     "referenced_type" : "type-313"
     },
     {
      "referenced_type" : "type-8"
@@ -6219,7 +6228,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-479"
+     "referenced_type" : "type-313"
     },
     {
      "referenced_type" : "type-8"
@@ -6236,7 +6245,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-479"
+     "referenced_type" : "type-313"
     }
    ],
    "return_type" : "type-54",
@@ -6249,7 +6258,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-479"
+     "referenced_type" : "type-313"
     }
    ],
    "return_type" : "type-54",
@@ -6262,7 +6271,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-479"
+     "referenced_type" : "type-313"
     }
    ],
    "return_type" : "type-54",
@@ -6275,7 +6284,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-479"
+     "referenced_type" : "type-313"
     }
    ],
    "return_type" : "type-54",
@@ -6288,7 +6297,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-479"
+     "referenced_type" : "type-313"
     }
    ],
    "return_type" : "type-54",
@@ -6301,7 +6310,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-479"
+     "referenced_type" : "type-313"
     }
    ],
    "return_type" : "type-54",
@@ -6395,7 +6404,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-412"
     }
    ],
    "return_type" : "type-4",
@@ -6408,10 +6417,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-802"
+     "referenced_type" : "type-423"
     }
    ],
    "return_type" : "type-4",
@@ -6425,10 +6434,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-795"
+     "referenced_type" : "type-416"
     }
    ],
    "return_type" : "type-4",
@@ -6441,7 +6450,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-412"
     }
    ],
    "return_type" : "type-54",
@@ -6454,7 +6463,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-412"
     }
    ],
    "return_type" : "type-4",
@@ -6467,10 +6476,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-795"
+     "referenced_type" : "type-416"
     },
     {
      "referenced_type" : "type-4"
@@ -6486,7 +6495,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-412"
     },
     {
      "referenced_type" : "type-4"
@@ -6508,7 +6517,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-412"
     }
    ],
    "return_type" : "type-54",
@@ -6521,7 +6530,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-412"
     }
    ],
    "return_type" : "type-54",
@@ -6534,7 +6543,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-412"
     }
    ],
    "return_type" : "type-54",
@@ -6547,7 +6556,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-412"
     }
    ],
    "return_type" : "type-54",
@@ -6560,7 +6569,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-412"
     }
    ],
    "return_type" : "type-54",
@@ -6573,10 +6582,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-424"
     },
     {
-     "referenced_type" : "type-810"
+     "referenced_type" : "type-431"
     }
    ],
    "return_type" : "type-4",
@@ -6589,7 +6598,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-424"
     }
    ],
    "return_type" : "type-54",
@@ -6602,7 +6611,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-424"
     },
     {
      "referenced_type" : "type-4"
@@ -6624,10 +6633,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-424"
     },
     {
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-412"
     },
     {
      "referenced_type" : "type-258"
@@ -6643,7 +6652,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-424"
     }
    ],
    "return_type" : "type-54",
@@ -6656,7 +6665,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-424"
     }
    ],
    "return_type" : "type-54",
@@ -6669,7 +6678,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-424"
     }
    ],
    "return_type" : "type-54",
@@ -6682,7 +6691,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-424"
     }
    ],
    "return_type" : "type-54",
@@ -6695,7 +6704,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-424"
     }
    ],
    "return_type" : "type-54",
@@ -6708,10 +6717,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-481"
+     "referenced_type" : "type-315"
     },
     {
-     "referenced_type" : "type-492"
+     "referenced_type" : "type-326"
     }
    ],
    "return_type" : "type-4",
@@ -6724,10 +6733,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-481"
+     "referenced_type" : "type-315"
     },
     {
-     "referenced_type" : "type-484"
+     "referenced_type" : "type-318"
     },
     {
      "referenced_type" : "type-4"
@@ -6743,7 +6752,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-481"
+     "referenced_type" : "type-315"
     }
    ],
    "return_type" : "type-54",
@@ -6756,7 +6765,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-481"
+     "referenced_type" : "type-315"
     }
    ],
    "return_type" : "type-4",
@@ -6769,10 +6778,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-481"
+     "referenced_type" : "type-315"
     },
     {
-     "referenced_type" : "type-493"
+     "referenced_type" : "type-327"
     }
    ],
    "return_type" : "type-4",
@@ -6785,7 +6794,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-481"
+     "referenced_type" : "type-315"
     }
    ],
    "return_type" : "type-54",
@@ -6798,7 +6807,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-481"
+     "referenced_type" : "type-315"
     }
    ],
    "return_type" : "type-54",
@@ -6811,7 +6820,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-481"
+     "referenced_type" : "type-315"
     }
    ],
    "return_type" : "type-54",
@@ -6824,7 +6833,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-481"
+     "referenced_type" : "type-315"
     }
    ],
    "return_type" : "type-54",
@@ -6837,7 +6846,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-481"
+     "referenced_type" : "type-315"
     }
    ],
    "return_type" : "type-54",
@@ -6851,7 +6860,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-472"
+     "referenced_type" : "type-307"
     }
    ],
    "return_type" : "type-4",
@@ -6864,7 +6873,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-472"
+     "referenced_type" : "type-307"
     }
    ],
    "return_type" : "type-53",
@@ -6877,7 +6886,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-472"
+     "referenced_type" : "type-307"
     }
    ],
    "return_type" : "type-4",
@@ -6890,7 +6899,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-472"
+     "referenced_type" : "type-307"
     }
    ],
    "return_type" : "type-4",
@@ -6903,7 +6912,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-472"
+     "referenced_type" : "type-307"
     }
    ],
    "return_type" : "type-8",
@@ -6917,7 +6926,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-472"
+     "referenced_type" : "type-307"
     },
     {
      "referenced_type" : "type-53"
@@ -6942,7 +6951,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-472"
+     "referenced_type" : "type-307"
     }
    ],
    "return_type" : "type-8",
@@ -6956,7 +6965,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-472"
+     "referenced_type" : "type-307"
     }
    ],
    "return_type" : "type-54",
@@ -6970,7 +6979,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-472"
+     "referenced_type" : "type-307"
     },
     {
      "referenced_type" : "type-90"
@@ -6990,7 +6999,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-472"
+     "referenced_type" : "type-307"
     }
    ],
    "return_type" : "type-54",
@@ -7003,10 +7012,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-472"
+     "referenced_type" : "type-307"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-310"
     }
    ],
    "return_type" : "type-4",
@@ -7019,7 +7028,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-472"
+     "referenced_type" : "type-307"
     },
     {
      "referenced_type" : "type-90"
@@ -7041,7 +7050,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-472"
+     "referenced_type" : "type-307"
     },
     {
      "referenced_type" : "type-18"
@@ -7061,7 +7070,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-472"
+     "referenced_type" : "type-307"
     },
     {
      "referenced_type" : "type-18"
@@ -7081,7 +7090,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-472"
+     "referenced_type" : "type-307"
     }
    ],
    "return_type" : "type-54",
@@ -7094,7 +7103,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-472"
+     "referenced_type" : "type-307"
     }
    ],
    "return_type" : "type-54",
@@ -7107,7 +7116,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-472"
+     "referenced_type" : "type-307"
     }
    ],
    "return_type" : "type-54",
@@ -7120,10 +7129,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-348"
     },
     {
-     "referenced_type" : "type-733"
+     "referenced_type" : "type-354"
     }
    ],
    "return_type" : "type-4",
@@ -7136,7 +7145,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-348"
     }
    ],
    "return_type" : "type-54",
@@ -7149,7 +7158,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-348"
     }
    ],
    "return_type" : "type-54",
@@ -7162,7 +7171,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-348"
     }
    ],
    "return_type" : "type-54",
@@ -7175,7 +7184,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-348"
     }
    ],
    "return_type" : "type-54",
@@ -7188,7 +7197,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-348"
     }
    ],
    "return_type" : "type-54",
@@ -7201,7 +7210,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-295"
     }
    ],
    "return_type" : "type-53",
@@ -7214,7 +7223,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-295"
     }
    ],
    "return_type" : "type-8",
@@ -7228,7 +7237,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-295"
     },
     {
      "referenced_type" : "type-53"
@@ -7253,7 +7262,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-295"
     }
    ],
    "return_type" : "type-8",
@@ -7267,7 +7276,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-295"
     },
     {
      "referenced_type" : "type-53"
@@ -7287,7 +7296,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-295"
     }
    ],
    "return_type" : "type-54",
@@ -7300,7 +7309,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-295"
     },
     {
      "referenced_type" : "type-53"
@@ -7322,7 +7331,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-295"
     },
     {
      "referenced_type" : "type-18"
@@ -7342,7 +7351,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-295"
     },
     {
      "referenced_type" : "type-18"
@@ -7362,7 +7371,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-295"
     }
    ],
    "return_type" : "type-54",
@@ -7375,7 +7384,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-295"
     }
    ],
    "return_type" : "type-54",
@@ -7388,7 +7397,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-295"
     }
    ],
    "return_type" : "type-54",
@@ -7684,16 +7693,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-740"
+     "referenced_type" : "type-361"
     }
    ],
-   "return_type" : "type-812",
+   "return_type" : "type-445",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
   {
    "function_name" : "android::IAAudioClient::getDefaultImpl",
    "linker_set_key" : "_ZN7android13IAAudioClient14getDefaultImplEv",
-   "return_type" : "type-745",
+   "return_type" : "type-366",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
   {
@@ -7702,7 +7711,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-813"
+     "referenced_type" : "type-446"
     }
    ],
    "return_type" : "type-16",
@@ -7715,7 +7724,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-365"
     }
    ],
    "return_type" : "type-54",
@@ -7728,7 +7737,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-365"
     }
    ],
    "return_type" : "type-54",
@@ -7741,7 +7750,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-365"
     }
    ],
    "return_type" : "type-54",
@@ -7754,7 +7763,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-365"
     }
    ],
    "return_type" : "type-54",
@@ -7767,16 +7776,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-748"
+     "referenced_type" : "type-369"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-751"
+     "referenced_type" : "type-372"
     },
     {
-     "referenced_type" : "type-752"
+     "referenced_type" : "type-373"
     },
     {
      "default_arg" : true,
@@ -7792,16 +7801,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-390"
     }
    ],
-   "return_type" : "type-814",
+   "return_type" : "type-447",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
   {
    "function_name" : "android::IAAudioService::getDefaultImpl",
    "linker_set_key" : "_ZN7android14IAAudioService14getDefaultImplEv",
-   "return_type" : "type-774",
+   "return_type" : "type-395",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
   {
@@ -7810,7 +7819,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-815"
+     "referenced_type" : "type-448"
     }
    ],
    "return_type" : "type-16",
@@ -7823,7 +7832,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-773"
+     "referenced_type" : "type-394"
     }
    ],
    "return_type" : "type-54",
@@ -7836,7 +7845,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-773"
+     "referenced_type" : "type-394"
     }
    ],
    "return_type" : "type-54",
@@ -7849,7 +7858,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-773"
+     "referenced_type" : "type-394"
     }
    ],
    "return_type" : "type-54",
@@ -7862,7 +7871,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-773"
+     "referenced_type" : "type-394"
     }
    ],
    "return_type" : "type-54",
@@ -7875,16 +7884,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-398"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-401"
     },
     {
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-402"
     },
     {
      "default_arg" : true,
@@ -8207,7 +8216,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1125"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-8"
@@ -8226,7 +8235,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1125"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-4"
@@ -8242,7 +8251,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1125"
+     "referenced_type" : "type-824"
     },
     {
      "referenced_type" : "type-4"
@@ -8705,7 +8714,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-825"
     },
     {
      "referenced_type" : "type-8"
@@ -8724,7 +8733,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-825"
     },
     {
      "referenced_type" : "type-4"
@@ -8740,7 +8749,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-825"
     },
     {
      "referenced_type" : "type-4"
@@ -8756,7 +8765,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-826"
     },
     {
      "referenced_type" : "type-8"
@@ -8775,7 +8784,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-826"
     },
     {
      "referenced_type" : "type-4"
@@ -8791,7 +8800,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-826"
     },
     {
      "referenced_type" : "type-4"
@@ -8820,7 +8829,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-279"
+     "referenced_type" : "type-325"
     }
    ],
    "return_type" : "type-4",
@@ -8833,7 +8842,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-279"
+     "referenced_type" : "type-325"
     }
    ],
    "return_type" : "type-4",
@@ -8846,7 +8855,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-279"
+     "referenced_type" : "type-325"
     }
    ],
    "return_type" : "type-54",
@@ -8963,7 +8972,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-275"
     }
    ],
    "return_type" : "type-54",
@@ -8976,7 +8985,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-275"
     }
    ],
    "return_type" : "type-4",
@@ -8992,7 +9001,7 @@
      "referenced_type" : "type-156"
     },
     {
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-343"
     }
    ],
    "return_type" : "type-4",
@@ -9084,10 +9093,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-406"
     },
     {
-     "referenced_type" : "type-786"
+     "referenced_type" : "type-407"
     }
    ],
    "return_type" : "type-4",
@@ -9101,7 +9110,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-406"
     }
    ],
    "return_type" : "type-4",
@@ -9153,6 +9162,20 @@
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
   },
   {
+   "access" : "private",
+   "function_name" : "aaudio::IsochronousClockModel::getLateTimeOffsetNanos",
+   "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel22getLateTimeOffsetNanosEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-193"
+    }
+   ],
+   "return_type" : "type-4",
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
+  },
+  {
    "function_name" : "aaudio::IsochronousClockModel::convertDeltaPositionToTime",
    "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel26convertDeltaPositionToTimeEx",
    "parameters" :
@@ -9185,6 +9208,38 @@
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
   },
   {
+   "function_name" : "aaudio::IsochronousClockModel::convertLatestTimeToPosition",
+   "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel27convertLatestTimeToPositionEx",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-193"
+    },
+    {
+     "referenced_type" : "type-8"
+    }
+   ],
+   "return_type" : "type-8",
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
+  },
+  {
+   "function_name" : "aaudio::IsochronousClockModel::convertPositionToLatestTime",
+   "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel27convertPositionToLatestTimeEx",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-193"
+    },
+    {
+     "referenced_type" : "type-8"
+    }
+   ],
+   "return_type" : "type-8",
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
+  },
+  {
    "function_name" : "aaudio::IsochronousClockModel::dump",
    "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel4dumpEv",
    "parameters" :
@@ -9243,10 +9298,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-797"
+     "referenced_type" : "type-418"
     },
     {
-     "referenced_type" : "type-798"
+     "referenced_type" : "type-419"
     }
    ],
    "return_type" : "type-4",
@@ -9260,7 +9315,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-797"
+     "referenced_type" : "type-418"
     }
    ],
    "return_type" : "type-4",
@@ -9273,10 +9328,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-805"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-806"
+     "referenced_type" : "type-427"
     }
    ],
    "return_type" : "type-4",
@@ -9290,7 +9345,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-805"
+     "referenced_type" : "type-426"
     }
    ],
    "return_type" : "type-4",
@@ -9303,10 +9358,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-320"
     },
     {
-     "referenced_type" : "type-487"
+     "referenced_type" : "type-321"
     }
    ],
    "return_type" : "type-4",
@@ -9320,7 +9375,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-320"
     }
    ],
    "return_type" : "type-4",
@@ -9333,10 +9388,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-349"
     },
     {
-     "referenced_type" : "type-729"
+     "referenced_type" : "type-350"
     }
    ],
    "return_type" : "type-4",
@@ -9349,10 +9404,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-743"
+     "referenced_type" : "type-364"
     }
    ],
-   "return_type" : "type-741",
+   "return_type" : "type-362",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
   {
@@ -9362,10 +9417,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-772"
+     "referenced_type" : "type-393"
     }
    ],
-   "return_type" : "type-770",
+   "return_type" : "type-391",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
   {
@@ -9394,16 +9449,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-748"
+     "referenced_type" : "type-369"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-751"
+     "referenced_type" : "type-372"
     },
     {
-     "referenced_type" : "type-752"
+     "referenced_type" : "type-373"
     },
     {
      "default_arg" : true,
@@ -9420,16 +9475,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-398"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-401"
     },
     {
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-402"
     },
     {
      "default_arg" : true,
@@ -9446,10 +9501,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-348"
     },
     {
-     "referenced_type" : "type-733"
+     "referenced_type" : "type-354"
     }
    ],
    "return_type" : "type-4",
@@ -9462,10 +9517,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-349"
     },
     {
-     "referenced_type" : "type-729"
+     "referenced_type" : "type-350"
     }
    ],
    "return_type" : "type-4",
@@ -9484,7 +9539,7 @@
    "access" : "private",
    "linker_set_key" : "_ZN7android13IAAudioClient12default_implE",
    "name" : "android::IAAudioClient::default_impl",
-   "referenced_type" : "type-300",
+   "referenced_type" : "type-452",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
   {
@@ -9497,7 +9552,7 @@
    "access" : "private",
    "linker_set_key" : "_ZN7android14IAAudioService12default_implE",
    "name" : "android::IAAudioService::default_impl",
-   "referenced_type" : "type-301",
+   "referenced_type" : "type-453",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   }
  ],
@@ -9526,7 +9581,7 @@
    "linker_set_key" : "aaudio::AAudioServiceMessage_s &",
    "name" : "aaudio::AAudioServiceMessage_s &",
    "referenced_type" : "type-199",
-   "self_type" : "type-446",
+   "self_type" : "type-280",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
@@ -9544,7 +9599,7 @@
    "linker_set_key" : "aaudio::AudioEndpointParcelable &",
    "name" : "aaudio::AudioEndpointParcelable &",
    "referenced_type" : "type-28",
-   "self_type" : "type-502",
+   "self_type" : "type-336",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9571,7 +9626,7 @@
    "linker_set_key" : "const aaudio::AAudioStreamRequest &",
    "name" : "const aaudio::AAudioStreamRequest &",
    "referenced_type" : "type-155",
-   "self_type" : "type-501",
+   "self_type" : "type-335",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9606,8 +9661,8 @@
    "alignment" : 4,
    "linker_set_key" : "const aaudio::AudioStreamBuilder &",
    "name" : "const aaudio::AudioStreamBuilder &",
-   "referenced_type" : "type-473",
-   "self_type" : "type-475",
+   "referenced_type" : "type-308",
+   "self_type" : "type-310",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
@@ -9615,8 +9670,8 @@
    "alignment" : 4,
    "linker_set_key" : "const aaudio::AudioStreamBuilder &",
    "name" : "const aaudio::AudioStreamBuilder &",
-   "referenced_type" : "type-685",
-   "self_type" : "type-687",
+   "referenced_type" : "type-774",
+   "self_type" : "type-776",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
@@ -9624,8 +9679,8 @@
    "alignment" : 4,
    "linker_set_key" : "const aaudio::AudioStreamBuilder &",
    "name" : "const aaudio::AudioStreamBuilder &",
-   "referenced_type" : "type-990",
-   "self_type" : "type-992",
+   "referenced_type" : "type-997",
+   "self_type" : "type-999",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
@@ -9633,8 +9688,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AudioClient &",
    "name" : "const android::AudioClient &",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1029",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9642,8 +9697,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AudioClient &",
    "name" : "const android::AudioClient &",
-   "referenced_type" : "type-1064",
-   "self_type" : "type-1066",
+   "referenced_type" : "type-1071",
+   "self_type" : "type-1073",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9741,17 +9796,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AudioClient &",
    "name" : "const android::AudioClient &",
-   "referenced_type" : "type-368",
-   "self_type" : "type-370",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AudioClient &",
-   "name" : "const android::AudioClient &",
-   "referenced_type" : "type-443",
-   "self_type" : "type-445",
+   "referenced_type" : "type-277",
+   "self_type" : "type-279",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
@@ -9759,8 +9805,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AudioClient &",
    "name" : "const android::AudioClient &",
-   "referenced_type" : "type-503",
-   "self_type" : "type-505",
+   "referenced_type" : "type-337",
+   "self_type" : "type-339",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9768,8 +9814,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AudioClient &",
    "name" : "const android::AudioClient &",
-   "referenced_type" : "type-581",
-   "self_type" : "type-583",
+   "referenced_type" : "type-380",
+   "self_type" : "type-382",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9777,8 +9823,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AudioClient &",
    "name" : "const android::AudioClient &",
-   "referenced_type" : "type-656",
-   "self_type" : "type-658",
+   "referenced_type" : "type-520",
+   "self_type" : "type-522",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AudioClient &",
+   "name" : "const android::AudioClient &",
+   "referenced_type" : "type-670",
+   "self_type" : "type-672",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AudioClient &",
+   "name" : "const android::AudioClient &",
+   "referenced_type" : "type-745",
+   "self_type" : "type-747",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
@@ -9786,8 +9850,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AudioClient &",
    "name" : "const android::AudioClient &",
-   "referenced_type" : "type-715",
-   "self_type" : "type-717",
+   "referenced_type" : "type-804",
+   "self_type" : "type-806",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9795,8 +9859,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AudioClient &",
    "name" : "const android::AudioClient &",
-   "referenced_type" : "type-759",
-   "self_type" : "type-761",
+   "referenced_type" : "type-893",
+   "self_type" : "type-895",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9804,17 +9868,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AudioClient &",
    "name" : "const android::AudioClient &",
-   "referenced_type" : "type-886",
-   "self_type" : "type-888",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AudioClient &",
-   "name" : "const android::AudioClient &",
-   "referenced_type" : "type-961",
-   "self_type" : "type-963",
+   "referenced_type" : "type-968",
+   "self_type" : "type-970",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
@@ -9822,8 +9877,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1063",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -9831,8 +9886,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-1083",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-1090",
+   "self_type" : "type-1092",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -9859,7 +9914,7 @@
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
    "referenced_type" : "type-1495",
-   "self_type" : "type-1497",
+   "self_type" : "type-1498",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -9876,8 +9931,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-749",
-   "self_type" : "type-751",
+   "referenced_type" : "type-370",
+   "self_type" : "type-372",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -9885,8 +9940,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-778",
-   "self_type" : "type-780",
+   "referenced_type" : "type-399",
+   "self_type" : "type-401",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -9894,8 +9949,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-1041",
-   "self_type" : "type-1046",
+   "referenced_type" : "type-1048",
+   "self_type" : "type-1053",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -9903,8 +9958,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-1070",
-   "self_type" : "type-1075",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1082",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -9931,7 +9986,7 @@
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
    "referenced_type" : "type-1481",
-   "self_type" : "type-1486",
+   "self_type" : "type-1487",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -9948,8 +10003,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-736",
-   "self_type" : "type-741",
+   "referenced_type" : "type-357",
+   "self_type" : "type-362",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -9957,8 +10012,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-765",
-   "self_type" : "type-770",
+   "referenced_type" : "type-386",
+   "self_type" : "type-391",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -9966,8 +10021,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "referenced_type" : "type-1098",
-   "self_type" : "type-1100",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1008",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
+   "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1107",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -10011,8 +10075,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "referenced_type" : "type-482",
-   "self_type" : "type-484",
+   "referenced_type" : "type-316",
+   "self_type" : "type-318",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -10020,17 +10084,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "referenced_type" : "type-694",
-   "self_type" : "type-696",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "referenced_type" : "type-793",
-   "self_type" : "type-795",
+   "referenced_type" : "type-414",
+   "self_type" : "type-416",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -10038,8 +10093,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "referenced_type" : "type-999",
-   "self_type" : "type-1001",
+   "referenced_type" : "type-783",
+   "self_type" : "type-785",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -10047,8 +10102,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-1015",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1024",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10056,8 +10111,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-1059",
-   "self_type" : "type-1063",
+   "referenced_type" : "type-1068",
+   "self_type" : "type-1070",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10083,7 +10138,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-1367",
+   "referenced_type" : "type-1369",
    "self_type" : "type-1371",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
@@ -10137,8 +10192,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-365",
-   "self_type" : "type-367",
+   "referenced_type" : "type-332",
+   "self_type" : "type-334",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10146,8 +10201,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-498",
-   "self_type" : "type-500",
+   "referenced_type" : "type-377",
+   "self_type" : "type-379",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10155,8 +10210,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-578",
-   "self_type" : "type-580",
+   "referenced_type" : "type-517",
+   "self_type" : "type-519",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10164,8 +10219,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-710",
-   "self_type" : "type-712",
+   "referenced_type" : "type-667",
+   "self_type" : "type-669",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10173,8 +10228,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-754",
-   "self_type" : "type-758",
+   "referenced_type" : "type-799",
+   "self_type" : "type-801",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10182,8 +10237,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-883",
-   "self_type" : "type-885",
+   "referenced_type" : "type-890",
+   "self_type" : "type-892",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10191,8 +10246,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IBinder> &",
    "name" : "const android::sp<android::IBinder> &",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1052",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -10200,8 +10255,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IBinder> &",
    "name" : "const android::sp<android::IBinder> &",
-   "referenced_type" : "type-1072",
-   "self_type" : "type-1074",
+   "referenced_type" : "type-1079",
+   "self_type" : "type-1081",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -10245,8 +10300,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IBinder> &",
    "name" : "const android::sp<android::IBinder> &",
-   "referenced_type" : "type-738",
-   "self_type" : "type-740",
+   "referenced_type" : "type-359",
+   "self_type" : "type-361",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -10254,8 +10309,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IBinder> &",
    "name" : "const android::sp<android::IBinder> &",
-   "referenced_type" : "type-767",
-   "self_type" : "type-769",
+   "referenced_type" : "type-388",
+   "self_type" : "type-390",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -10263,8 +10318,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-1023",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-1030",
+   "self_type" : "type-1032",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10272,8 +10327,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-1067",
-   "self_type" : "type-1069",
+   "referenced_type" : "type-1074",
+   "self_type" : "type-1076",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10353,8 +10408,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-374",
-   "self_type" : "type-376",
+   "referenced_type" : "type-340",
+   "self_type" : "type-342",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10362,8 +10417,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-506",
-   "self_type" : "type-508",
+   "referenced_type" : "type-383",
+   "self_type" : "type-385",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10371,8 +10426,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-587",
-   "self_type" : "type-589",
+   "referenced_type" : "type-526",
+   "self_type" : "type-528",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10380,8 +10435,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-718",
-   "self_type" : "type-720",
+   "referenced_type" : "type-676",
+   "self_type" : "type-678",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10389,8 +10444,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-762",
-   "self_type" : "type-764",
+   "referenced_type" : "type-807",
+   "self_type" : "type-809",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10398,8 +10453,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-892",
-   "self_type" : "type-894",
+   "referenced_type" : "type-899",
+   "self_type" : "type-901",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10407,8 +10462,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> > &",
    "name" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> > &",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1050",
+   "referenced_type" : "type-1058",
+   "self_type" : "type-1057",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -10434,8 +10489,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> > &",
    "name" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> > &",
-   "referenced_type" : "type-746",
-   "self_type" : "type-745",
+   "referenced_type" : "type-367",
+   "self_type" : "type-366",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -10443,8 +10498,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> > &",
    "name" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> > &",
-   "referenced_type" : "type-1080",
-   "self_type" : "type-1079",
+   "referenced_type" : "type-1087",
+   "self_type" : "type-1086",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -10470,8 +10525,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> > &",
    "name" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> > &",
-   "referenced_type" : "type-775",
-   "self_type" : "type-774",
+   "referenced_type" : "type-396",
+   "self_type" : "type-395",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -10536,8 +10591,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamBuilderStruct *",
    "name" : "AAudioStreamBuilderStruct *",
-   "referenced_type" : "type-391",
-   "self_type" : "type-390",
+   "referenced_type" : "type-543",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10545,8 +10600,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamBuilderStruct *",
    "name" : "AAudioStreamBuilderStruct *",
-   "referenced_type" : "type-604",
-   "self_type" : "type-603",
+   "referenced_type" : "type-693",
+   "self_type" : "type-692",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10554,8 +10609,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamBuilderStruct *",
    "name" : "AAudioStreamBuilderStruct *",
-   "referenced_type" : "type-909",
-   "self_type" : "type-908",
+   "referenced_type" : "type-916",
+   "self_type" : "type-915",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10599,8 +10654,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamBuilderStruct **",
    "name" : "AAudioStreamBuilderStruct **",
-   "referenced_type" : "type-390",
-   "self_type" : "type-394",
+   "referenced_type" : "type-542",
+   "self_type" : "type-546",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10608,8 +10663,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamBuilderStruct **",
    "name" : "AAudioStreamBuilderStruct **",
-   "referenced_type" : "type-603",
-   "self_type" : "type-607",
+   "referenced_type" : "type-692",
+   "self_type" : "type-696",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10617,8 +10672,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamBuilderStruct **",
    "name" : "AAudioStreamBuilderStruct **",
-   "referenced_type" : "type-908",
-   "self_type" : "type-912",
+   "referenced_type" : "type-915",
+   "self_type" : "type-919",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10626,8 +10681,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-1062",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1066",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10707,8 +10762,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1367",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10887,8 +10942,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-283",
-   "self_type" : "type-282",
+   "referenced_type" : "type-293",
+   "self_type" : "type-292",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10896,17 +10951,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-385",
-   "self_type" : "type-384",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-389",
-   "self_type" : "type-388",
+   "referenced_type" : "type-301",
+   "self_type" : "type-300",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10914,8 +10960,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-401",
-   "self_type" : "type-400",
+   "referenced_type" : "type-306",
+   "self_type" : "type-305",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10923,53 +10969,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-411",
-   "self_type" : "type-410",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-418",
-   "self_type" : "type-417",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-458",
-   "self_type" : "type-457",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-466",
-   "self_type" : "type-465",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-471",
-   "self_type" : "type-470",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-513",
-   "self_type" : "type-512",
+   "referenced_type" : "type-376",
+   "self_type" : "type-375",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10986,8 +10987,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
+   "referenced_type" : "type-537",
+   "self_type" : "type-536",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10995,6 +10996,42 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-541",
+   "self_type" : "type-540",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-553",
+   "self_type" : "type-552",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-563",
+   "self_type" : "type-562",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-570",
+   "self_type" : "type-569",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
    "referenced_type" : "type-602",
    "self_type" : "type-601",
    "size" : 4,
@@ -11004,71 +11041,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-613",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-624",
-   "self_type" : "type-623",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-631",
-   "self_type" : "type-630",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-670",
-   "self_type" : "type-669",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-678",
-   "self_type" : "type-677",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-683",
-   "self_type" : "type-682",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-757",
-   "self_type" : "type-756",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-903",
-   "self_type" : "type-902",
+   "referenced_type" : "type-687",
+   "self_type" : "type-686",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -11076,8 +11050,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-907",
-   "self_type" : "type-906",
+   "referenced_type" : "type-691",
+   "self_type" : "type-690",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -11085,8 +11059,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-919",
-   "self_type" : "type-918",
+   "referenced_type" : "type-703",
+   "self_type" : "type-702",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -11094,8 +11068,80 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-929",
-   "self_type" : "type-928",
+   "referenced_type" : "type-713",
+   "self_type" : "type-712",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-720",
+   "self_type" : "type-719",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-759",
+   "self_type" : "type-758",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-767",
+   "self_type" : "type-766",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-772",
+   "self_type" : "type-771",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-814",
+   "self_type" : "type-813",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-910",
+   "self_type" : "type-909",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-914",
+   "self_type" : "type-913",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-926",
+   "self_type" : "type-925",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -11112,8 +11158,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-975",
-   "self_type" : "type-974",
+   "referenced_type" : "type-943",
+   "self_type" : "type-942",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -11121,8 +11167,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-983",
-   "self_type" : "type-982",
+   "referenced_type" : "type-982",
+   "self_type" : "type-981",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -11130,8 +11176,17 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-988",
-   "self_type" : "type-987",
+   "referenced_type" : "type-990",
+   "self_type" : "type-989",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-995",
+   "self_type" : "type-994",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -11175,8 +11230,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct **",
    "name" : "AAudioStreamStruct **",
-   "referenced_type" : "type-384",
-   "self_type" : "type-387",
+   "referenced_type" : "type-536",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -11184,8 +11239,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct **",
    "name" : "AAudioStreamStruct **",
-   "referenced_type" : "type-597",
-   "self_type" : "type-600",
+   "referenced_type" : "type-686",
+   "self_type" : "type-689",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -11193,8 +11248,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct **",
    "name" : "AAudioStreamStruct **",
-   "referenced_type" : "type-902",
-   "self_type" : "type-905",
+   "referenced_type" : "type-909",
+   "self_type" : "type-912",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -11257,7 +11312,7 @@
    "linker_set_key" : "SimpleDoubleBuffer<Timestamp> *",
    "name" : "SimpleDoubleBuffer<Timestamp> *",
    "referenced_type" : "type-20",
-   "self_type" : "type-448",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/AAudioUtilities.h"
   },
@@ -11266,7 +11321,7 @@
    "linker_set_key" : "Timestamp *",
    "name" : "Timestamp *",
    "referenced_type" : "type-22",
-   "self_type" : "type-274",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/AAudioUtilities.h"
   },
@@ -11302,7 +11357,7 @@
    "linker_set_key" : "aaudio::AAudioServiceMessage_s *",
    "name" : "aaudio::AAudioServiceMessage_s *",
    "referenced_type" : "type-199",
-   "self_type" : "type-440",
+   "self_type" : "type-274",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioEndpoint.h"
   },
@@ -11311,7 +11366,7 @@
    "linker_set_key" : "aaudio::AAudioStreamConfiguration *",
    "name" : "aaudio::AAudioStreamConfiguration *",
    "referenced_type" : "type-150",
-   "self_type" : "type-727",
+   "self_type" : "type-348",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -11338,7 +11393,7 @@
    "linker_set_key" : "aaudio::AudioEndpoint *",
    "name" : "aaudio::AudioEndpoint *",
    "referenced_type" : "type-10",
-   "self_type" : "type-436",
+   "self_type" : "type-270",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioEndpoint.h"
   },
@@ -11347,7 +11402,7 @@
    "linker_set_key" : "aaudio::AudioEndpointParcelable *",
    "name" : "aaudio::AudioEndpointParcelable *",
    "referenced_type" : "type-28",
-   "self_type" : "type-481",
+   "self_type" : "type-315",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -11374,7 +11429,7 @@
    "linker_set_key" : "aaudio::AudioStream::MyPlayerBase *",
    "name" : "aaudio::AudioStream::MyPlayerBase *",
    "referenced_type" : "type-264",
-   "self_type" : "type-270",
+   "self_type" : "type-273",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -11383,7 +11438,7 @@
    "linker_set_key" : "aaudio::AudioStreamBuilder *",
    "name" : "aaudio::AudioStreamBuilder *",
    "referenced_type" : "type-248",
-   "self_type" : "type-272",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStreamBuilder.h"
   },
@@ -11401,7 +11456,7 @@
    "linker_set_key" : "aaudio::AudioStreamInternalCapture *",
    "name" : "aaudio::AudioStreamInternalCapture *",
    "referenced_type" : "type-69",
-   "self_type" : "type-460",
+   "self_type" : "type-295",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalCapture.h"
   },
@@ -11410,7 +11465,7 @@
    "linker_set_key" : "aaudio::AudioStreamInternalPlay *",
    "name" : "aaudio::AudioStreamInternalPlay *",
    "referenced_type" : "type-113",
-   "self_type" : "type-472",
+   "self_type" : "type-307",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
@@ -11455,7 +11510,7 @@
    "linker_set_key" : "aaudio::EndpointDescriptor_s *",
    "name" : "aaudio::EndpointDescriptor_s *",
    "referenced_type" : "type-39",
-   "self_type" : "type-493",
+   "self_type" : "type-327",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -11464,7 +11519,7 @@
    "linker_set_key" : "aaudio::IsochronousClockModel *",
    "name" : "aaudio::IsochronousClockModel *",
    "referenced_type" : "type-7",
-   "self_type" : "type-479",
+   "self_type" : "type-313",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
   },
@@ -11473,7 +11528,7 @@
    "linker_set_key" : "aaudio::RingBufferDescriptor_s *",
    "name" : "aaudio::RingBufferDescriptor_s *",
    "referenced_type" : "type-40",
-   "self_type" : "type-792",
+   "self_type" : "type-413",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11482,7 +11537,7 @@
    "linker_set_key" : "aaudio::RingBufferParcelable *",
    "name" : "aaudio::RingBufferParcelable *",
    "referenced_type" : "type-29",
-   "self_type" : "type-783",
+   "self_type" : "type-404",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11491,7 +11546,7 @@
    "linker_set_key" : "aaudio::SharedMemoryParcelable *",
    "name" : "aaudio::SharedMemoryParcelable *",
    "referenced_type" : "type-35",
-   "self_type" : "type-791",
+   "self_type" : "type-412",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11500,7 +11555,7 @@
    "linker_set_key" : "aaudio::SharedRegionParcelable *",
    "name" : "aaudio::SharedRegionParcelable *",
    "referenced_type" : "type-30",
-   "self_type" : "type-803",
+   "self_type" : "type-424",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -11509,7 +11564,7 @@
    "linker_set_key" : "android::BnAAudioClient *",
    "name" : "android::BnAAudioClient *",
    "referenced_type" : "type-165",
-   "self_type" : "type-748",
+   "self_type" : "type-369",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -11518,7 +11573,7 @@
    "linker_set_key" : "android::BnAAudioService *",
    "name" : "android::BnAAudioService *",
    "referenced_type" : "type-170",
-   "self_type" : "type-777",
+   "self_type" : "type-398",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -11562,8 +11617,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ExtendedTimestamp *",
    "name" : "android::ExtendedTimestamp *",
-   "referenced_type" : "type-407",
-   "self_type" : "type-406",
+   "referenced_type" : "type-559",
+   "self_type" : "type-558",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -11571,8 +11626,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ExtendedTimestamp *",
    "name" : "android::ExtendedTimestamp *",
-   "referenced_type" : "type-620",
-   "self_type" : "type-619",
+   "referenced_type" : "type-709",
+   "self_type" : "type-708",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -11580,8 +11635,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ExtendedTimestamp *",
    "name" : "android::ExtendedTimestamp *",
-   "referenced_type" : "type-925",
-   "self_type" : "type-924",
+   "referenced_type" : "type-932",
+   "self_type" : "type-931",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -11626,7 +11681,7 @@
    "linker_set_key" : "android::IAAudioClient *",
    "name" : "android::IAAudioClient *",
    "referenced_type" : "type-161",
-   "self_type" : "type-744",
+   "self_type" : "type-365",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -11635,7 +11690,7 @@
    "linker_set_key" : "android::IAAudioService *",
    "name" : "android::IAAudioService *",
    "referenced_type" : "type-168",
-   "self_type" : "type-773",
+   "self_type" : "type-394",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -11643,8 +11698,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-1005",
-   "self_type" : "type-1004",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1011",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -11652,8 +11707,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-1027",
-   "self_type" : "type-1026",
+   "referenced_type" : "type-1034",
+   "self_type" : "type-1033",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -11661,8 +11716,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-1035",
-   "self_type" : "type-1034",
+   "referenced_type" : "type-1042",
+   "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -11670,8 +11725,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-1058",
-   "self_type" : "type-1057",
+   "referenced_type" : "type-1065",
+   "self_type" : "type-1064",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -11679,8 +11734,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-1087",
-   "self_type" : "type-1086",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1093",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -11688,8 +11743,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-1092",
-   "self_type" : "type-1091",
+   "referenced_type" : "type-1099",
+   "self_type" : "type-1098",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11697,8 +11752,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-1104",
-   "self_type" : "type-1103",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1110",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -11706,8 +11761,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-1119",
+   "self_type" : "type-1118",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -11859,8 +11914,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-488",
-   "self_type" : "type-487",
+   "referenced_type" : "type-322",
+   "self_type" : "type-321",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -11868,17 +11923,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-700",
-   "self_type" : "type-699",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel *",
-   "name" : "android::Parcel *",
-   "referenced_type" : "type-722",
-   "self_type" : "type-721",
+   "referenced_type" : "type-344",
+   "self_type" : "type-343",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -11886,8 +11932,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-730",
-   "self_type" : "type-729",
+   "referenced_type" : "type-351",
+   "self_type" : "type-350",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -11895,8 +11941,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-753",
-   "self_type" : "type-752",
+   "referenced_type" : "type-374",
+   "self_type" : "type-373",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -11904,8 +11950,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-782",
-   "self_type" : "type-781",
+   "referenced_type" : "type-403",
+   "self_type" : "type-402",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -11913,8 +11959,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-787",
-   "self_type" : "type-786",
+   "referenced_type" : "type-408",
+   "self_type" : "type-407",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11922,8 +11968,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-799",
-   "self_type" : "type-798",
+   "referenced_type" : "type-420",
+   "self_type" : "type-419",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -11931,13 +11977,22 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-807",
-   "self_type" : "type-806",
+   "referenced_type" : "type-428",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::Parcel *",
+   "name" : "android::Parcel *",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::WrappingBuffer *",
    "name" : "android::WrappingBuffer *",
    "referenced_type" : "type-205",
@@ -11958,8 +12013,8 @@
    "alignment" : 4,
    "linker_set_key" : "const SimpleDoubleBuffer<Timestamp> *",
    "name" : "const SimpleDoubleBuffer<Timestamp> *",
-   "referenced_type" : "type-449",
-   "self_type" : "type-450",
+   "referenced_type" : "type-284",
+   "self_type" : "type-285",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/AAudioUtilities.h"
   },
@@ -11967,8 +12022,8 @@
    "alignment" : 4,
    "linker_set_key" : "const Timestamp *",
    "name" : "const Timestamp *",
-   "referenced_type" : "type-275",
-   "self_type" : "type-276",
+   "referenced_type" : "type-289",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/AAudioUtilities.h"
   },
@@ -11977,7 +12032,7 @@
    "linker_set_key" : "const aaudio::AAudioStreamConfiguration *",
    "name" : "const aaudio::AAudioStreamConfiguration *",
    "referenced_type" : "type-159",
-   "self_type" : "type-728",
+   "self_type" : "type-349",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -12003,8 +12058,8 @@
    "alignment" : 4,
    "linker_set_key" : "const aaudio::AudioEndpoint *",
    "name" : "const aaudio::AudioEndpoint *",
-   "referenced_type" : "type-278",
-   "self_type" : "type-279",
+   "referenced_type" : "type-314",
+   "self_type" : "type-325",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioEndpoint.h"
   },
@@ -12012,8 +12067,8 @@
    "alignment" : 4,
    "linker_set_key" : "const aaudio::AudioEndpointParcelable *",
    "name" : "const aaudio::AudioEndpointParcelable *",
-   "referenced_type" : "type-485",
-   "self_type" : "type-486",
+   "referenced_type" : "type-319",
+   "self_type" : "type-320",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -12031,7 +12086,7 @@
    "linker_set_key" : "const aaudio::AudioStreamBuilder *",
    "name" : "const aaudio::AudioStreamBuilder *",
    "referenced_type" : "type-247",
-   "self_type" : "type-271",
+   "self_type" : "type-275",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStreamBuilder.h"
   },
@@ -12084,8 +12139,8 @@
    "alignment" : 4,
    "linker_set_key" : "const aaudio::EndpointDescriptor_s *",
    "name" : "const aaudio::EndpointDescriptor_s *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-438",
+   "referenced_type" : "type-271",
+   "self_type" : "type-272",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioEndpoint.h"
   },
@@ -12102,8 +12157,8 @@
    "alignment" : 4,
    "linker_set_key" : "const aaudio::RingBufferParcelable *",
    "name" : "const aaudio::RingBufferParcelable *",
-   "referenced_type" : "type-784",
-   "self_type" : "type-785",
+   "referenced_type" : "type-405",
+   "self_type" : "type-406",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -12111,8 +12166,8 @@
    "alignment" : 4,
    "linker_set_key" : "const aaudio::SharedMemoryParcelable *",
    "name" : "const aaudio::SharedMemoryParcelable *",
-   "referenced_type" : "type-796",
-   "self_type" : "type-797",
+   "referenced_type" : "type-417",
+   "self_type" : "type-418",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -12120,8 +12175,8 @@
    "alignment" : 4,
    "linker_set_key" : "const aaudio::SharedRegionParcelable *",
    "name" : "const aaudio::SharedRegionParcelable *",
-   "referenced_type" : "type-804",
-   "self_type" : "type-805",
+   "referenced_type" : "type-425",
+   "self_type" : "type-426",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -12138,8 +12193,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IAAudioClient *",
    "name" : "const android::IAAudioClient *",
-   "referenced_type" : "type-742",
-   "self_type" : "type-743",
+   "referenced_type" : "type-363",
+   "self_type" : "type-364",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12147,8 +12202,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IAAudioService *",
    "name" : "const android::IAAudioService *",
-   "referenced_type" : "type-771",
-   "self_type" : "type-772",
+   "referenced_type" : "type-392",
+   "self_type" : "type-393",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -12156,8 +12211,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1009",
+   "referenced_type" : "type-1013",
+   "self_type" : "type-1016",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -12165,8 +12220,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-1028",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-1035",
+   "self_type" : "type-1037",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -12174,8 +12229,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-1036",
-   "self_type" : "type-1038",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1045",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -12183,8 +12238,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-1093",
-   "self_type" : "type-1095",
+   "referenced_type" : "type-1100",
+   "self_type" : "type-1102",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -12192,8 +12247,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-1105",
-   "self_type" : "type-1107",
+   "referenced_type" : "type-1112",
+   "self_type" : "type-1114",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -12201,8 +12256,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-1113",
-   "self_type" : "type-1115",
+   "referenced_type" : "type-1120",
+   "self_type" : "type-1122",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -12318,8 +12373,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-489",
-   "self_type" : "type-492",
+   "referenced_type" : "type-323",
+   "self_type" : "type-326",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -12327,17 +12382,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-701",
-   "self_type" : "type-704",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Parcel *",
-   "name" : "const android::Parcel *",
-   "referenced_type" : "type-723",
-   "self_type" : "type-725",
+   "referenced_type" : "type-345",
+   "self_type" : "type-347",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -12345,8 +12391,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-731",
-   "self_type" : "type-733",
+   "referenced_type" : "type-352",
+   "self_type" : "type-354",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -12354,8 +12400,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-788",
-   "self_type" : "type-790",
+   "referenced_type" : "type-409",
+   "self_type" : "type-411",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -12363,8 +12409,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-800",
-   "self_type" : "type-802",
+   "referenced_type" : "type-421",
+   "self_type" : "type-423",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -12372,13 +12418,22 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-808",
-   "self_type" : "type-810",
+   "referenced_type" : "type-429",
+   "self_type" : "type-431",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::Parcel *",
+   "name" : "const android::Parcel *",
+   "referenced_type" : "type-790",
+   "self_type" : "type-793",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
    "referenced_type" : "type-209",
@@ -12562,7 +12617,7 @@
    "linker_set_key" : "flowgraph::SourceFloat *",
    "name" : "flowgraph::SourceFloat *",
    "referenced_type" : "type-267",
-   "self_type" : "type-1125",
+   "self_type" : "type-824",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/SourceFloat.h"
   },
@@ -12571,7 +12626,7 @@
    "linker_set_key" : "flowgraph::SourceI16 *",
    "name" : "flowgraph::SourceI16 *",
    "referenced_type" : "type-268",
-   "self_type" : "type-1126",
+   "self_type" : "type-825",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/SourceI16.h"
   },
@@ -12580,7 +12635,7 @@
    "linker_set_key" : "flowgraph::SourceI24 *",
    "name" : "flowgraph::SourceI24 *",
    "referenced_type" : "type-269",
-   "self_type" : "type-1127",
+   "self_type" : "type-826",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/SourceI24.h"
   },
@@ -12642,8 +12697,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::atomic<long long> *",
    "name" : "std::atomic<long long> *",
-   "referenced_type" : "type-426",
-   "self_type" : "type-425",
+   "referenced_type" : "type-578",
+   "self_type" : "type-577",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/fifo/FifoControllerIndirect.h"
   },
@@ -12651,8 +12706,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::atomic<long long> *",
    "name" : "std::atomic<long long> *",
-   "referenced_type" : "type-639",
-   "self_type" : "type-638",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/fifo/FifoControllerIndirect.h"
   },
@@ -12660,8 +12715,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::atomic<long long> *",
    "name" : "std::atomic<long long> *",
-   "referenced_type" : "type-944",
-   "self_type" : "type-943",
+   "referenced_type" : "type-951",
+   "self_type" : "type-950",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/fifo/FifoControllerIndirect.h"
   },
@@ -12738,7 +12793,7 @@
    "linker_set_key" : "const SimpleDoubleBuffer<Timestamp>",
    "name" : "const SimpleDoubleBuffer<Timestamp>",
    "referenced_type" : "type-20",
-   "self_type" : "type-449",
+   "self_type" : "type-284",
    "size" : 40,
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/AAudioUtilities.h"
   },
@@ -12748,7 +12803,7 @@
    "linker_set_key" : "const Timestamp",
    "name" : "const Timestamp",
    "referenced_type" : "type-22",
-   "self_type" : "type-275",
+   "self_type" : "type-289",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/AAudioUtilities.h"
   },
@@ -12788,7 +12843,7 @@
    "linker_set_key" : "const aaudio::AudioEndpoint",
    "name" : "const aaudio::AudioEndpoint",
    "referenced_type" : "type-10",
-   "self_type" : "type-278",
+   "self_type" : "type-314",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioEndpoint.h"
   },
@@ -12798,7 +12853,7 @@
    "linker_set_key" : "const aaudio::AudioEndpointParcelable",
    "name" : "const aaudio::AudioEndpointParcelable",
    "referenced_type" : "type-28",
-   "self_type" : "type-485",
+   "self_type" : "type-319",
    "size" : 792,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -12842,24 +12897,24 @@
    "is_const" : true,
    "linker_set_key" : "const aaudio::AudioStreamBuilder",
    "name" : "const aaudio::AudioStreamBuilder",
-   "referenced_type" : "type-474",
-   "self_type" : "type-473",
+   "referenced_type" : "type-309",
+   "self_type" : "type-308",
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const aaudio::AudioStreamBuilder",
    "name" : "const aaudio::AudioStreamBuilder",
-   "referenced_type" : "type-686",
-   "self_type" : "type-685",
+   "referenced_type" : "type-775",
+   "self_type" : "type-774",
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const aaudio::AudioStreamBuilder",
    "name" : "const aaudio::AudioStreamBuilder",
-   "referenced_type" : "type-991",
-   "self_type" : "type-990",
+   "referenced_type" : "type-998",
+   "self_type" : "type-997",
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
   {
@@ -12869,7 +12924,7 @@
    "name" : "const aaudio::AudioStreamInternal",
    "referenced_type" : "type-6",
    "self_type" : "type-65",
-   "size" : 1200,
+   "size" : 1208,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
   {
@@ -12879,7 +12934,7 @@
    "name" : "const aaudio::AudioStreamInternalCapture",
    "referenced_type" : "type-69",
    "self_type" : "type-70",
-   "size" : 1208,
+   "size" : 1216,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalCapture.h"
   },
   {
@@ -12889,7 +12944,7 @@
    "name" : "const aaudio::AudioStreamInternalPlay",
    "referenced_type" : "type-113",
    "self_type" : "type-114",
-   "size" : 1232,
+   "size" : 1240,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
   {
@@ -12918,7 +12973,7 @@
    "linker_set_key" : "const aaudio::EndpointDescriptor_s",
    "name" : "const aaudio::EndpointDescriptor_s",
    "referenced_type" : "type-39",
-   "self_type" : "type-437",
+   "self_type" : "type-271",
    "size" : 84,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioEndpoint.h"
   },
@@ -12929,7 +12984,7 @@
    "name" : "const aaudio::IsochronousClockModel",
    "referenced_type" : "type-7",
    "self_type" : "type-192",
-   "size" : 40,
+   "size" : 48,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
   },
   {
@@ -12938,7 +12993,7 @@
    "linker_set_key" : "const aaudio::RingBufferParcelable",
    "name" : "const aaudio::RingBufferParcelable",
    "referenced_type" : "type-29",
-   "self_type" : "type-784",
+   "self_type" : "type-405",
    "size" : 68,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -12948,7 +13003,7 @@
    "linker_set_key" : "const aaudio::SharedMemoryParcelable",
    "name" : "const aaudio::SharedMemoryParcelable",
    "referenced_type" : "type-35",
-   "self_type" : "type-796",
+   "self_type" : "type-417",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -12958,7 +13013,7 @@
    "linker_set_key" : "const aaudio::SharedRegionParcelable",
    "name" : "const aaudio::SharedRegionParcelable",
    "referenced_type" : "type-30",
-   "self_type" : "type-804",
+   "self_type" : "type-425",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -12967,8 +13022,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-1021",
-   "self_type" : "type-1020",
+   "referenced_type" : "type-1028",
+   "self_type" : "type-1027",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -12977,8 +13032,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-1065",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1071",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -13087,18 +13142,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-369",
-   "self_type" : "type-368",
-   "size" : 20,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::AudioClient",
-   "name" : "const android::AudioClient",
-   "referenced_type" : "type-444",
-   "self_type" : "type-443",
+   "referenced_type" : "type-278",
+   "self_type" : "type-277",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
@@ -13107,8 +13152,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-504",
-   "self_type" : "type-503",
+   "referenced_type" : "type-338",
+   "self_type" : "type-337",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -13117,8 +13162,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-582",
-   "self_type" : "type-581",
+   "referenced_type" : "type-381",
+   "self_type" : "type-380",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -13127,8 +13172,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-657",
-   "self_type" : "type-656",
+   "referenced_type" : "type-521",
+   "self_type" : "type-520",
+   "size" : 20,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::AudioClient",
+   "name" : "const android::AudioClient",
+   "referenced_type" : "type-671",
+   "self_type" : "type-670",
+   "size" : 20,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::AudioClient",
+   "name" : "const android::AudioClient",
+   "referenced_type" : "type-746",
+   "self_type" : "type-745",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
@@ -13137,8 +13202,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-716",
-   "self_type" : "type-715",
+   "referenced_type" : "type-805",
+   "self_type" : "type-804",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -13147,8 +13212,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-760",
-   "self_type" : "type-759",
+   "referenced_type" : "type-894",
+   "self_type" : "type-893",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -13157,18 +13222,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-887",
-   "self_type" : "type-886",
-   "size" : 20,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::AudioClient",
-   "name" : "const android::AudioClient",
-   "referenced_type" : "type-962",
-   "self_type" : "type-961",
+   "referenced_type" : "type-969",
+   "self_type" : "type-968",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
@@ -13188,7 +13243,7 @@
    "linker_set_key" : "const android::IAAudioClient",
    "name" : "const android::IAAudioClient",
    "referenced_type" : "type-161",
-   "self_type" : "type-742",
+   "self_type" : "type-363",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13198,7 +13253,7 @@
    "linker_set_key" : "const android::IAAudioService",
    "name" : "const android::IAAudioService",
    "referenced_type" : "type-168",
-   "self_type" : "type-771",
+   "self_type" : "type-392",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -13207,8 +13262,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1006",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1013",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -13217,8 +13272,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-1029",
-   "self_type" : "type-1028",
+   "referenced_type" : "type-1036",
+   "self_type" : "type-1035",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -13227,8 +13282,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1036",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1043",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -13237,8 +13292,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-1055",
-   "self_type" : "type-1054",
+   "referenced_type" : "type-1062",
+   "self_type" : "type-1061",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13247,8 +13302,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-1084",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-1091",
+   "self_type" : "type-1090",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -13257,8 +13312,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-1094",
-   "self_type" : "type-1093",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1100",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -13267,8 +13322,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-1106",
-   "self_type" : "type-1105",
+   "referenced_type" : "type-1113",
+   "self_type" : "type-1112",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -13277,8 +13332,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-1114",
-   "self_type" : "type-1113",
+   "referenced_type" : "type-1121",
+   "self_type" : "type-1120",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -13447,8 +13502,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-490",
-   "self_type" : "type-489",
+   "referenced_type" : "type-324",
+   "self_type" : "type-323",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -13457,18 +13512,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-702",
-   "self_type" : "type-701",
-   "size" : 60,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Parcel",
-   "name" : "const android::Parcel",
-   "referenced_type" : "type-724",
-   "self_type" : "type-723",
+   "referenced_type" : "type-346",
+   "self_type" : "type-345",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -13477,8 +13522,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-732",
-   "self_type" : "type-731",
+   "referenced_type" : "type-353",
+   "self_type" : "type-352",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -13487,8 +13532,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-750",
-   "self_type" : "type-749",
+   "referenced_type" : "type-371",
+   "self_type" : "type-370",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13497,8 +13542,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-779",
-   "self_type" : "type-778",
+   "referenced_type" : "type-400",
+   "self_type" : "type-399",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -13507,8 +13552,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-789",
-   "self_type" : "type-788",
+   "referenced_type" : "type-410",
+   "self_type" : "type-409",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -13517,8 +13562,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-801",
-   "self_type" : "type-800",
+   "referenced_type" : "type-422",
+   "self_type" : "type-421",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -13527,18 +13572,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-809",
-   "self_type" : "type-808",
+   "referenced_type" : "type-430",
+   "self_type" : "type-429",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::Parcel",
+   "name" : "const android::Parcel",
+   "referenced_type" : "type-791",
+   "self_type" : "type-790",
+   "size" : 60,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1001",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13547,8 +13602,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1042",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-1019",
+   "self_type" : "type-1018",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13557,8 +13612,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1071",
-   "self_type" : "type-1070",
+   "referenced_type" : "type-1049",
+   "self_type" : "type-1048",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::String16",
+   "name" : "const android::String16",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1077",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13767,8 +13832,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-362",
-   "self_type" : "type-361",
+   "referenced_type" : "type-288",
+   "self_type" : "type-287",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13777,8 +13842,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-396",
-   "self_type" : "type-395",
+   "referenced_type" : "type-297",
+   "self_type" : "type-296",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13787,8 +13852,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-453",
-   "self_type" : "type-452",
+   "referenced_type" : "type-312",
+   "self_type" : "type-311",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13797,8 +13862,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-462",
-   "self_type" : "type-461",
+   "referenced_type" : "type-329",
+   "self_type" : "type-328",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13807,8 +13872,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-478",
-   "self_type" : "type-477",
+   "referenced_type" : "type-358",
+   "self_type" : "type-357",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13817,8 +13882,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-495",
-   "self_type" : "type-494",
+   "referenced_type" : "type-387",
+   "self_type" : "type-386",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13827,8 +13892,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-575",
-   "self_type" : "type-574",
+   "referenced_type" : "type-514",
+   "self_type" : "type-513",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13837,8 +13902,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-609",
-   "self_type" : "type-608",
+   "referenced_type" : "type-548",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13847,8 +13912,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-665",
-   "self_type" : "type-664",
+   "referenced_type" : "type-664",
+   "self_type" : "type-663",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13857,8 +13922,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-674",
-   "self_type" : "type-673",
+   "referenced_type" : "type-698",
+   "self_type" : "type-697",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13867,8 +13932,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-690",
-   "self_type" : "type-689",
+   "referenced_type" : "type-754",
+   "self_type" : "type-753",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13877,8 +13942,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-707",
-   "self_type" : "type-706",
+   "referenced_type" : "type-763",
+   "self_type" : "type-762",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13887,8 +13952,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-779",
+   "self_type" : "type-778",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13897,8 +13962,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
+   "referenced_type" : "type-796",
+   "self_type" : "type-795",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13907,8 +13972,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-880",
-   "self_type" : "type-879",
+   "referenced_type" : "type-887",
+   "self_type" : "type-886",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13917,8 +13982,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-914",
-   "self_type" : "type-913",
+   "referenced_type" : "type-921",
+   "self_type" : "type-920",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13927,8 +13992,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-970",
-   "self_type" : "type-969",
+   "referenced_type" : "type-977",
+   "self_type" : "type-976",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13937,18 +14002,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-979",
-   "self_type" : "type-978",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::String16",
-   "name" : "const android::String16",
-   "referenced_type" : "type-995",
-   "self_type" : "type-994",
+   "referenced_type" : "type-986",
+   "self_type" : "type-985",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13957,8 +14012,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-1000",
-   "self_type" : "type-999",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1006",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -13967,8 +14022,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1098",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1105",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -14017,8 +14072,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-483",
-   "self_type" : "type-482",
+   "referenced_type" : "type-317",
+   "self_type" : "type-316",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -14027,28 +14082,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-695",
-   "self_type" : "type-694",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-794",
-   "self_type" : "type-793",
+   "referenced_type" : "type-415",
+   "self_type" : "type-414",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
+   "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
+   "referenced_type" : "type-784",
+   "self_type" : "type-783",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1039",
+   "referenced_type" : "type-1047",
+   "self_type" : "type-1046",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14337,8 +14392,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-281",
-   "self_type" : "type-280",
+   "referenced_type" : "type-291",
+   "self_type" : "type-290",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14347,8 +14402,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-372",
-   "self_type" : "type-371",
+   "referenced_type" : "type-299",
+   "self_type" : "type-298",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14357,8 +14412,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-393",
-   "self_type" : "type-392",
+   "referenced_type" : "type-304",
+   "self_type" : "type-303",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14367,58 +14422,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-399",
-   "self_type" : "type-398",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-409",
-   "self_type" : "type-408",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-416",
-   "self_type" : "type-415",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-456",
-   "self_type" : "type-455",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-464",
-   "self_type" : "type-463",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-467",
+   "referenced_type" : "type-356",
+   "self_type" : "type-355",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14437,8 +14442,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-511",
-   "self_type" : "type-510",
+   "referenced_type" : "type-524",
+   "self_type" : "type-523",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14447,8 +14452,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-585",
-   "self_type" : "type-584",
+   "referenced_type" : "type-545",
+   "self_type" : "type-544",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14457,8 +14462,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-606",
-   "self_type" : "type-605",
+   "referenced_type" : "type-551",
+   "self_type" : "type-550",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14467,8 +14472,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-612",
-   "self_type" : "type-611",
+   "referenced_type" : "type-561",
+   "self_type" : "type-560",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14477,8 +14482,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
+   "referenced_type" : "type-568",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14487,8 +14492,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-629",
-   "self_type" : "type-628",
+   "referenced_type" : "type-600",
+   "self_type" : "type-599",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14497,8 +14502,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-668",
-   "self_type" : "type-667",
+   "referenced_type" : "type-674",
+   "self_type" : "type-673",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14507,8 +14512,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-676",
-   "self_type" : "type-675",
+   "referenced_type" : "type-695",
+   "self_type" : "type-694",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14517,8 +14522,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-680",
-   "self_type" : "type-679",
+   "referenced_type" : "type-701",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14527,8 +14532,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-735",
-   "self_type" : "type-734",
+   "referenced_type" : "type-711",
+   "self_type" : "type-710",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14537,8 +14542,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-890",
-   "self_type" : "type-889",
+   "referenced_type" : "type-718",
+   "self_type" : "type-717",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14547,8 +14552,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-911",
-   "self_type" : "type-910",
+   "referenced_type" : "type-757",
+   "self_type" : "type-756",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14557,8 +14562,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-917",
-   "self_type" : "type-916",
+   "referenced_type" : "type-765",
+   "self_type" : "type-764",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14567,8 +14572,48 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-927",
-   "self_type" : "type-926",
+   "referenced_type" : "type-769",
+   "self_type" : "type-768",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
+   "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
+   "referenced_type" : "type-812",
+   "self_type" : "type-811",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
+   "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
+   "referenced_type" : "type-897",
+   "self_type" : "type-896",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
+   "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
+   "referenced_type" : "type-918",
+   "self_type" : "type-917",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
+   "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
+   "referenced_type" : "type-924",
+   "self_type" : "type-923",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14587,8 +14632,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-973",
-   "self_type" : "type-972",
+   "referenced_type" : "type-941",
+   "self_type" : "type-940",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14597,8 +14642,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-981",
-   "self_type" : "type-980",
+   "referenced_type" : "type-980",
+   "self_type" : "type-979",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14607,8 +14652,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-985",
-   "self_type" : "type-984",
+   "referenced_type" : "type-988",
+   "self_type" : "type-987",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
+   "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
+   "referenced_type" : "type-992",
+   "self_type" : "type-991",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14777,8 +14832,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-342",
-   "self_type" : "type-341",
+   "referenced_type" : "type-494",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -14787,8 +14842,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-404",
-   "self_type" : "type-403",
+   "referenced_type" : "type-556",
+   "self_type" : "type-555",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -14797,8 +14852,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-413",
-   "self_type" : "type-412",
+   "referenced_type" : "type-565",
+   "self_type" : "type-564",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -14807,8 +14862,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-421",
-   "self_type" : "type-420",
+   "referenced_type" : "type-573",
+   "self_type" : "type-572",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -14817,8 +14872,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-644",
+   "self_type" : "type-643",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -14827,8 +14882,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-617",
-   "self_type" : "type-616",
+   "referenced_type" : "type-706",
+   "self_type" : "type-705",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -14837,8 +14892,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-626",
-   "self_type" : "type-625",
+   "referenced_type" : "type-715",
+   "self_type" : "type-714",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -14847,8 +14902,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-634",
-   "self_type" : "type-633",
+   "referenced_type" : "type-723",
+   "self_type" : "type-722",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -14857,8 +14912,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-860",
-   "self_type" : "type-859",
+   "referenced_type" : "type-867",
+   "self_type" : "type-866",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -14867,8 +14922,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-922",
-   "self_type" : "type-921",
+   "referenced_type" : "type-929",
+   "self_type" : "type-928",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -14877,8 +14932,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-931",
-   "self_type" : "type-930",
+   "referenced_type" : "type-938",
+   "self_type" : "type-937",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -14887,8 +14942,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-939",
-   "self_type" : "type-938",
+   "referenced_type" : "type-946",
+   "self_type" : "type-945",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -14897,8 +14952,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioClient>",
    "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1022",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -14907,8 +14962,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioClient>",
    "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-1060",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-1069",
+   "self_type" : "type-1068",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -14935,8 +14990,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioClient>",
    "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-1368",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1369",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -14985,38 +15040,12 @@
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::IAAudioClient>",
-   "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-366",
-   "self_type" : "type-365",
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioClient>",
    "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-499",
-   "self_type" : "type-498",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::IAAudioClient>",
-   "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-579",
-   "self_type" : "type-578",
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::IAAudioClient>",
-   "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-711",
-   "self_type" : "type-710",
+   "referenced_type" : "type-333",
+   "self_type" : "type-332",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -15025,8 +15054,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioClient>",
    "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-755",
-   "self_type" : "type-754",
+   "referenced_type" : "type-378",
+   "self_type" : "type-377",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -15034,8 +15063,34 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioClient>",
    "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-884",
-   "self_type" : "type-883",
+   "referenced_type" : "type-518",
+   "self_type" : "type-517",
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IAAudioClient>",
+   "name" : "const android::sp<android::IAAudioClient>",
+   "referenced_type" : "type-668",
+   "self_type" : "type-667",
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IAAudioClient>",
+   "name" : "const android::sp<android::IAAudioClient>",
+   "referenced_type" : "type-800",
+   "self_type" : "type-799",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IAAudioClient>",
+   "name" : "const android::sp<android::IAAudioClient>",
+   "referenced_type" : "type-891",
+   "self_type" : "type-890",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
@@ -15043,8 +15098,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioService>",
    "name" : "const android::sp<android::IAAudioService>",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1020",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -15063,8 +15118,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioService>",
    "name" : "const android::sp<android::IAAudioService>",
-   "referenced_type" : "type-1454",
-   "self_type" : "type-1453",
+   "referenced_type" : "type-1455",
+   "self_type" : "type-1454",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -15073,8 +15128,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioService>",
    "name" : "const android::sp<android::IAAudioService>",
-   "referenced_type" : "type-497",
-   "self_type" : "type-496",
+   "referenced_type" : "type-331",
+   "self_type" : "type-330",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -15083,8 +15138,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioService>",
    "name" : "const android::sp<android::IAAudioService>",
-   "referenced_type" : "type-709",
-   "self_type" : "type-708",
+   "referenced_type" : "type-798",
+   "self_type" : "type-797",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -15093,8 +15148,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IBinder>",
    "name" : "const android::sp<android::IBinder>",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1043",
+   "referenced_type" : "type-1051",
+   "self_type" : "type-1050",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -15103,8 +15158,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IBinder>",
    "name" : "const android::sp<android::IBinder>",
-   "referenced_type" : "type-1073",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-1080",
+   "self_type" : "type-1079",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -15153,8 +15208,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IBinder>",
    "name" : "const android::sp<android::IBinder>",
-   "referenced_type" : "type-739",
-   "self_type" : "type-738",
+   "referenced_type" : "type-360",
+   "self_type" : "type-359",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -15163,8 +15218,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IBinder>",
    "name" : "const android::sp<android::IBinder>",
-   "referenced_type" : "type-768",
-   "self_type" : "type-767",
+   "referenced_type" : "type-389",
+   "self_type" : "type-388",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -15172,16 +15227,16 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1030",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-1068",
-   "self_type" : "type-1067",
+   "referenced_type" : "type-1075",
+   "self_type" : "type-1074",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
@@ -15252,48 +15307,48 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-375",
-   "self_type" : "type-374",
+   "referenced_type" : "type-341",
+   "self_type" : "type-340",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-507",
-   "self_type" : "type-506",
+   "referenced_type" : "type-384",
+   "self_type" : "type-383",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-588",
-   "self_type" : "type-587",
+   "referenced_type" : "type-527",
+   "self_type" : "type-526",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-719",
-   "self_type" : "type-718",
+   "referenced_type" : "type-677",
+   "self_type" : "type-676",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-763",
-   "self_type" : "type-762",
+   "referenced_type" : "type-808",
+   "self_type" : "type-807",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-893",
-   "self_type" : "type-892",
+   "referenced_type" : "type-900",
+   "self_type" : "type-899",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
@@ -15371,8 +15426,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> >",
    "name" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> >",
-   "referenced_type" : "type-1052",
-   "self_type" : "type-1051",
+   "referenced_type" : "type-1059",
+   "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -15401,8 +15456,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> >",
    "name" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> >",
-   "referenced_type" : "type-747",
-   "self_type" : "type-746",
+   "referenced_type" : "type-368",
+   "self_type" : "type-367",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -15411,8 +15466,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> >",
    "name" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> >",
-   "referenced_type" : "type-1081",
-   "self_type" : "type-1080",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -15441,8 +15496,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> >",
    "name" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> >",
-   "referenced_type" : "type-776",
-   "self_type" : "type-775",
+   "referenced_type" : "type-397",
+   "self_type" : "type-396",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -15540,8 +15595,8 @@
    "linker_set_key" : "AudioClock",
    "name" : "AudioClock",
    "record_kind" : "class",
-   "referenced_type" : "type-273",
-   "self_type" : "type-273",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/AudioClock.h",
    "unique_id" : "_ZTS10AudioClock"
@@ -17378,109 +17433,109 @@
     {
      "access" : "protected",
      "field_name" : "mAudioEndpoint",
-     "field_offset" : 1408,
+     "field_offset" : 1472,
      "referenced_type" : "type-10"
     },
     {
      "access" : "protected",
      "field_name" : "mServiceStreamHandle",
-     "field_offset" : 1664,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mFramesPerBurst",
-     "field_offset" : 1696,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mXRunCount",
      "field_offset" : 1728,
      "referenced_type" : "type-4"
     },
     {
      "access" : "protected",
-     "field_name" : "mFramesOffsetFromService",
+     "field_name" : "mFramesPerBurst",
+     "field_offset" : 1760,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mXRunCount",
      "field_offset" : 1792,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mFramesOffsetFromService",
+     "field_offset" : 1856,
      "referenced_type" : "type-8"
     },
     {
      "access" : "protected",
      "field_name" : "mCallbackBuffer",
-     "field_offset" : 1856,
+     "field_offset" : 1920,
      "referenced_type" : "type-14"
     },
     {
      "access" : "protected",
      "field_name" : "mCallbackFrames",
-     "field_offset" : 1888,
+     "field_offset" : 1952,
      "referenced_type" : "type-4"
     },
     {
      "access" : "protected",
      "field_name" : "mInService",
-     "field_offset" : 1920,
+     "field_offset" : 1984,
      "referenced_type" : "type-16"
     },
     {
      "access" : "protected",
      "field_name" : "mServiceInterface",
-     "field_offset" : 1952,
+     "field_offset" : 2016,
      "referenced_type" : "type-18"
     },
     {
      "access" : "protected",
      "field_name" : "mAtomicInternalTimestamp",
-     "field_offset" : 1984,
+     "field_offset" : 2048,
      "referenced_type" : "type-20"
     },
     {
      "access" : "protected",
      "field_name" : "mNeedCatchUp",
-     "field_offset" : 2304,
+     "field_offset" : 2368,
      "referenced_type" : "type-24"
     },
     {
      "access" : "protected",
      "field_name" : "mStreamVolume",
-     "field_offset" : 2368,
+     "field_offset" : 2432,
      "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mWakeupDelayNanos",
-     "field_offset" : 2400,
+     "field_offset" : 2464,
      "referenced_type" : "type-13"
     },
     {
      "access" : "private",
      "field_name" : "mMinimumSleepNanos",
-     "field_offset" : 2432,
+     "field_offset" : 2496,
      "referenced_type" : "type-13"
     },
     {
      "access" : "private",
      "field_name" : "mEndPointParcelable",
-     "field_offset" : 2464,
+     "field_offset" : 2528,
      "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mEndpointDescriptor",
-     "field_offset" : 8800,
+     "field_offset" : 8864,
      "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mServiceLatencyNanos",
-     "field_offset" : 9472,
+     "field_offset" : 9536,
      "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mDeviceChannelCount",
-     "field_offset" : 9536,
+     "field_offset" : 9600,
      "referenced_type" : "type-4"
     }
    ],
@@ -17489,7 +17544,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-6",
    "self_type" : "type-6",
-   "size" : 1200,
+   "size" : 1208,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h",
    "unique_id" : "_ZTSN6aaudio19AudioStreamInternalE",
    "vtable_components" :
@@ -17626,7 +17681,7 @@
     {
      "access" : "private",
      "field_name" : "mLastFramesWritten",
-     "field_offset" : 9600,
+     "field_offset" : 9664,
      "referenced_type" : "type-8"
     }
    ],
@@ -17635,7 +17690,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-69",
    "self_type" : "type-69",
-   "size" : 1208,
+   "size" : 1216,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalCapture.h",
    "unique_id" : "_ZTSN6aaudio26AudioStreamInternalCaptureE",
    "vtable_components" :
@@ -17766,13 +17821,13 @@
     {
      "access" : "private",
      "field_name" : "mLastFramesRead",
-     "field_offset" : 9600,
+     "field_offset" : 9664,
      "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mFlowGraph",
-     "field_offset" : 9664,
+     "field_offset" : 9728,
      "referenced_type" : "type-106"
     }
    ],
@@ -17781,7 +17836,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-113",
    "self_type" : "type-113",
-   "size" : 1232,
+   "size" : 1240,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h",
    "unique_id" : "_ZTSN6aaudio23AudioStreamInternalPlayE",
    "vtable_components" :
@@ -18578,15 +18633,27 @@
     },
     {
      "access" : "private",
-     "field_name" : "mMaxLatenessInNanos",
+     "field_name" : "mBurstPeriodNanos",
      "field_offset" : 256,
      "referenced_type" : "type-4"
     },
     {
      "access" : "private",
-     "field_name" : "mState",
+     "field_name" : "mMaxMeasuredLatenessNanos",
      "field_offset" : 288,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mState",
+     "field_offset" : 320,
      "referenced_type" : "type-9"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampCount",
+     "field_offset" : 352,
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "aaudio::IsochronousClockModel",
@@ -18594,7 +18661,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-7",
    "self_type" : "type-7",
-   "size" : 40,
+   "size" : 48,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h",
    "unique_id" : "_ZTSN6aaudio21IsochronousClockModelE",
    "vtable_components" :
diff --git a/29/64/arm_armv8-a/source-based/libaaudio.so.lsdump b/29/64/arm_armv8-a/source-based/libaaudio.so.lsdump
index d7eea21..ebc1565 100644
--- a/29/64/arm_armv8-a/source-based/libaaudio.so.lsdump
+++ b/29/64/arm_armv8-a/source-based/libaaudio.so.lsdump
@@ -1582,12 +1582,21 @@
    "name" : "_ZNK6aaudio21IsochronousClockModel21convertTimeToPositionEx"
   },
   {
+   "name" : "_ZNK6aaudio21IsochronousClockModel22getLateTimeOffsetNanosEv"
+  },
+  {
    "name" : "_ZNK6aaudio21IsochronousClockModel26convertDeltaPositionToTimeEx"
   },
   {
    "name" : "_ZNK6aaudio21IsochronousClockModel26convertDeltaTimeToPositionEx"
   },
   {
+   "name" : "_ZNK6aaudio21IsochronousClockModel27convertLatestTimeToPositionEx"
+  },
+  {
+   "name" : "_ZNK6aaudio21IsochronousClockModel27convertPositionToLatestTimeEx"
+  },
+  {
    "name" : "_ZNK6aaudio21IsochronousClockModel4dumpEv"
   },
   {
@@ -5366,7 +5375,7 @@
      "referenced_type" : "type-157"
     },
     {
-     "referenced_type" : "type-725"
+     "referenced_type" : "type-513"
     }
    ],
    "return_type" : "type-4",
@@ -5868,7 +5877,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     },
     {
      "referenced_type" : "type-4"
@@ -5890,7 +5899,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     },
     {
      "referenced_type" : "type-4"
@@ -5921,10 +5930,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     },
     {
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-578"
     }
    ],
    "return_type" : "type-4",
@@ -5937,7 +5946,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-4",
@@ -5950,7 +5959,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     },
     {
      "referenced_type" : "type-4"
@@ -5966,7 +5975,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-4",
@@ -5979,7 +5988,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     },
     {
      "referenced_type" : "type-4"
@@ -5995,7 +6004,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-4",
@@ -6008,7 +6017,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     },
     {
      "referenced_type" : "type-4"
@@ -6024,7 +6033,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-54",
@@ -6037,13 +6046,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     },
     {
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-792"
+     "referenced_type" : "type-580"
     }
    ],
    "return_type" : "type-4",
@@ -6056,7 +6065,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-54",
@@ -6069,7 +6078,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-54",
@@ -6082,7 +6091,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-54",
@@ -6095,7 +6104,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-54",
@@ -6108,7 +6117,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-54",
@@ -6383,7 +6392,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-4",
@@ -6396,10 +6405,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-802"
+     "referenced_type" : "type-590"
     }
    ],
    "return_type" : "type-4",
@@ -6413,10 +6422,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-795"
+     "referenced_type" : "type-583"
     }
    ],
    "return_type" : "type-4",
@@ -6429,7 +6438,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-54",
@@ -6442,7 +6451,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-4",
@@ -6455,10 +6464,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-795"
+     "referenced_type" : "type-583"
     },
     {
      "referenced_type" : "type-4"
@@ -6474,7 +6483,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     },
     {
      "referenced_type" : "type-4"
@@ -6496,7 +6505,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-54",
@@ -6509,7 +6518,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-54",
@@ -6522,7 +6531,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-54",
@@ -6535,7 +6544,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-54",
@@ -6548,7 +6557,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-54",
@@ -6561,10 +6570,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     },
     {
-     "referenced_type" : "type-810"
+     "referenced_type" : "type-598"
     }
    ],
    "return_type" : "type-4",
@@ -6577,7 +6586,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     }
    ],
    "return_type" : "type-54",
@@ -6590,7 +6599,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     },
     {
      "referenced_type" : "type-4"
@@ -6612,10 +6621,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     },
     {
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     },
     {
      "referenced_type" : "type-258"
@@ -6631,7 +6640,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     }
    ],
    "return_type" : "type-54",
@@ -6644,7 +6653,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     }
    ],
    "return_type" : "type-54",
@@ -6657,7 +6666,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     }
    ],
    "return_type" : "type-54",
@@ -6670,7 +6679,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     }
    ],
    "return_type" : "type-54",
@@ -6683,7 +6692,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     }
    ],
    "return_type" : "type-54",
@@ -7108,10 +7117,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-515"
     },
     {
-     "referenced_type" : "type-733"
+     "referenced_type" : "type-521"
     }
    ],
    "return_type" : "type-4",
@@ -7124,7 +7133,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-515"
     }
    ],
    "return_type" : "type-54",
@@ -7137,7 +7146,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-515"
     }
    ],
    "return_type" : "type-54",
@@ -7150,7 +7159,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-515"
     }
    ],
    "return_type" : "type-54",
@@ -7163,7 +7172,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-515"
     }
    ],
    "return_type" : "type-54",
@@ -7176,7 +7185,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-515"
     }
    ],
    "return_type" : "type-54",
@@ -7672,16 +7681,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-740"
+     "referenced_type" : "type-528"
     }
    ],
-   "return_type" : "type-812",
+   "return_type" : "type-600",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
   {
    "function_name" : "android::IAAudioClient::getDefaultImpl",
    "linker_set_key" : "_ZN7android13IAAudioClient14getDefaultImplEv",
-   "return_type" : "type-745",
+   "return_type" : "type-533",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
   {
@@ -7690,7 +7699,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-813"
+     "referenced_type" : "type-601"
     }
    ],
    "return_type" : "type-16",
@@ -7703,7 +7712,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-532"
     }
    ],
    "return_type" : "type-54",
@@ -7716,7 +7725,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-532"
     }
    ],
    "return_type" : "type-54",
@@ -7729,7 +7738,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-532"
     }
    ],
    "return_type" : "type-54",
@@ -7742,7 +7751,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-532"
     }
    ],
    "return_type" : "type-54",
@@ -7755,16 +7764,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-748"
+     "referenced_type" : "type-536"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-751"
+     "referenced_type" : "type-539"
     },
     {
-     "referenced_type" : "type-752"
+     "referenced_type" : "type-540"
     },
     {
      "default_arg" : true,
@@ -7780,16 +7789,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-557"
     }
    ],
-   "return_type" : "type-814",
+   "return_type" : "type-602",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
   {
    "function_name" : "android::IAAudioService::getDefaultImpl",
    "linker_set_key" : "_ZN7android14IAAudioService14getDefaultImplEv",
-   "return_type" : "type-774",
+   "return_type" : "type-562",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
   {
@@ -7798,7 +7807,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-815"
+     "referenced_type" : "type-603"
     }
    ],
    "return_type" : "type-16",
@@ -7811,7 +7820,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-773"
+     "referenced_type" : "type-561"
     }
    ],
    "return_type" : "type-54",
@@ -7824,7 +7833,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-773"
+     "referenced_type" : "type-561"
     }
    ],
    "return_type" : "type-54",
@@ -7837,7 +7846,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-773"
+     "referenced_type" : "type-561"
     }
    ],
    "return_type" : "type-54",
@@ -7850,7 +7859,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-773"
+     "referenced_type" : "type-561"
     }
    ],
    "return_type" : "type-54",
@@ -7863,16 +7872,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-565"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-568"
     },
     {
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-569"
     },
     {
      "default_arg" : true,
@@ -8980,7 +8989,7 @@
      "referenced_type" : "type-156"
     },
     {
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-509"
     }
    ],
    "return_type" : "type-4",
@@ -9072,10 +9081,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-573"
     },
     {
-     "referenced_type" : "type-786"
+     "referenced_type" : "type-574"
     }
    ],
    "return_type" : "type-4",
@@ -9089,7 +9098,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-573"
     }
    ],
    "return_type" : "type-4",
@@ -9141,6 +9150,20 @@
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
   },
   {
+   "access" : "private",
+   "function_name" : "aaudio::IsochronousClockModel::getLateTimeOffsetNanos",
+   "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel22getLateTimeOffsetNanosEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-193"
+    }
+   ],
+   "return_type" : "type-4",
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
+  },
+  {
    "function_name" : "aaudio::IsochronousClockModel::convertDeltaPositionToTime",
    "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel26convertDeltaPositionToTimeEx",
    "parameters" :
@@ -9173,6 +9196,38 @@
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
   },
   {
+   "function_name" : "aaudio::IsochronousClockModel::convertLatestTimeToPosition",
+   "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel27convertLatestTimeToPositionEx",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-193"
+    },
+    {
+     "referenced_type" : "type-8"
+    }
+   ],
+   "return_type" : "type-8",
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
+  },
+  {
+   "function_name" : "aaudio::IsochronousClockModel::convertPositionToLatestTime",
+   "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel27convertPositionToLatestTimeEx",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-193"
+    },
+    {
+     "referenced_type" : "type-8"
+    }
+   ],
+   "return_type" : "type-8",
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
+  },
+  {
    "function_name" : "aaudio::IsochronousClockModel::dump",
    "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel4dumpEv",
    "parameters" :
@@ -9231,10 +9286,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-797"
+     "referenced_type" : "type-585"
     },
     {
-     "referenced_type" : "type-798"
+     "referenced_type" : "type-586"
     }
    ],
    "return_type" : "type-4",
@@ -9248,7 +9303,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-797"
+     "referenced_type" : "type-585"
     }
    ],
    "return_type" : "type-4",
@@ -9261,10 +9316,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-805"
+     "referenced_type" : "type-593"
     },
     {
-     "referenced_type" : "type-806"
+     "referenced_type" : "type-594"
     }
    ],
    "return_type" : "type-4",
@@ -9278,7 +9333,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-805"
+     "referenced_type" : "type-593"
     }
    ],
    "return_type" : "type-4",
@@ -9321,10 +9376,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-516"
     },
     {
-     "referenced_type" : "type-729"
+     "referenced_type" : "type-517"
     }
    ],
    "return_type" : "type-4",
@@ -9337,10 +9392,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-743"
+     "referenced_type" : "type-531"
     }
    ],
-   "return_type" : "type-741",
+   "return_type" : "type-529",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
   {
@@ -9350,10 +9405,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-772"
+     "referenced_type" : "type-560"
     }
    ],
-   "return_type" : "type-770",
+   "return_type" : "type-558",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
   {
@@ -9382,16 +9437,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-748"
+     "referenced_type" : "type-536"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-751"
+     "referenced_type" : "type-539"
     },
     {
-     "referenced_type" : "type-752"
+     "referenced_type" : "type-540"
     },
     {
      "default_arg" : true,
@@ -9408,16 +9463,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-565"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-568"
     },
     {
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-569"
     },
     {
      "default_arg" : true,
@@ -9434,10 +9489,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-515"
     },
     {
-     "referenced_type" : "type-733"
+     "referenced_type" : "type-521"
     }
    ],
    "return_type" : "type-4",
@@ -9450,10 +9505,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-516"
     },
     {
-     "referenced_type" : "type-729"
+     "referenced_type" : "type-517"
     }
    ],
    "return_type" : "type-4",
@@ -9603,8 +9658,8 @@
    "alignment" : 4,
    "linker_set_key" : "const aaudio::AudioStreamBuilder &",
    "name" : "const aaudio::AudioStreamBuilder &",
-   "referenced_type" : "type-685",
-   "self_type" : "type-687",
+   "referenced_type" : "type-774",
+   "self_type" : "type-776",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
@@ -9756,8 +9811,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AudioClient &",
    "name" : "const android::AudioClient &",
-   "referenced_type" : "type-581",
-   "self_type" : "type-583",
+   "referenced_type" : "type-547",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9765,8 +9820,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AudioClient &",
    "name" : "const android::AudioClient &",
-   "referenced_type" : "type-656",
-   "self_type" : "type-658",
+   "referenced_type" : "type-670",
+   "self_type" : "type-672",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AudioClient &",
+   "name" : "const android::AudioClient &",
+   "referenced_type" : "type-745",
+   "self_type" : "type-747",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
@@ -9774,17 +9838,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AudioClient &",
    "name" : "const android::AudioClient &",
-   "referenced_type" : "type-715",
-   "self_type" : "type-717",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AudioClient &",
-   "name" : "const android::AudioClient &",
-   "referenced_type" : "type-759",
-   "self_type" : "type-761",
+   "referenced_type" : "type-804",
+   "self_type" : "type-806",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9847,7 +9902,7 @@
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
    "referenced_type" : "type-1495",
-   "self_type" : "type-1497",
+   "self_type" : "type-1498",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -9864,8 +9919,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-749",
-   "self_type" : "type-751",
+   "referenced_type" : "type-537",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -9873,8 +9928,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-778",
-   "self_type" : "type-780",
+   "referenced_type" : "type-566",
+   "self_type" : "type-568",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -9919,7 +9974,7 @@
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
    "referenced_type" : "type-1481",
-   "self_type" : "type-1486",
+   "self_type" : "type-1487",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -9936,8 +9991,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-736",
-   "self_type" : "type-741",
+   "referenced_type" : "type-524",
+   "self_type" : "type-529",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -9945,8 +10000,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-765",
-   "self_type" : "type-770",
+   "referenced_type" : "type-553",
+   "self_type" : "type-558",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -10008,19 +10063,19 @@
    "alignment" : 4,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "referenced_type" : "type-694",
-   "self_type" : "type-696",
+   "referenced_type" : "type-581",
+   "self_type" : "type-583",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "referenced_type" : "type-793",
-   "self_type" : "type-795",
+   "referenced_type" : "type-783",
+   "self_type" : "type-785",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
   {
    "alignment" : 4,
@@ -10044,7 +10099,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-1059",
+   "referenced_type" : "type-1061",
    "self_type" : "type-1063",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
@@ -10071,7 +10126,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-1367",
+   "referenced_type" : "type-1369",
    "self_type" : "type-1371",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
@@ -10143,8 +10198,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-578",
-   "self_type" : "type-580",
+   "referenced_type" : "type-544",
+   "self_type" : "type-546",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10152,8 +10207,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-710",
-   "self_type" : "type-712",
+   "referenced_type" : "type-667",
+   "self_type" : "type-669",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10161,8 +10216,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-754",
-   "self_type" : "type-758",
+   "referenced_type" : "type-799",
+   "self_type" : "type-801",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10233,8 +10288,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IBinder> &",
    "name" : "const android::sp<android::IBinder> &",
-   "referenced_type" : "type-738",
-   "self_type" : "type-740",
+   "referenced_type" : "type-526",
+   "self_type" : "type-528",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -10242,8 +10297,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IBinder> &",
    "name" : "const android::sp<android::IBinder> &",
-   "referenced_type" : "type-767",
-   "self_type" : "type-769",
+   "referenced_type" : "type-555",
+   "self_type" : "type-557",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -10359,8 +10414,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-587",
-   "self_type" : "type-589",
+   "referenced_type" : "type-550",
+   "self_type" : "type-552",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10368,8 +10423,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-718",
-   "self_type" : "type-720",
+   "referenced_type" : "type-676",
+   "self_type" : "type-678",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10377,8 +10432,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-762",
-   "self_type" : "type-764",
+   "referenced_type" : "type-807",
+   "self_type" : "type-809",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10422,8 +10477,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> > &",
    "name" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> > &",
-   "referenced_type" : "type-746",
-   "self_type" : "type-745",
+   "referenced_type" : "type-534",
+   "self_type" : "type-533",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -10458,8 +10513,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> > &",
    "name" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> > &",
-   "referenced_type" : "type-775",
-   "self_type" : "type-774",
+   "referenced_type" : "type-563",
+   "self_type" : "type-562",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -10533,8 +10588,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamBuilderStruct *",
    "name" : "AAudioStreamBuilderStruct *",
-   "referenced_type" : "type-604",
-   "self_type" : "type-603",
+   "referenced_type" : "type-693",
+   "self_type" : "type-692",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10596,8 +10651,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamBuilderStruct **",
    "name" : "AAudioStreamBuilderStruct **",
-   "referenced_type" : "type-603",
-   "self_type" : "type-607",
+   "referenced_type" : "type-692",
+   "self_type" : "type-696",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10614,8 +10669,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-1062",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-1060",
+   "self_type" : "type-1059",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10695,8 +10750,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1367",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10956,15 +11011,6 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-513",
-   "self_type" : "type-512",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
    "referenced_type" : "type-52",
    "self_type" : "type-51",
    "size" : 4,
@@ -10974,8 +11020,17 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
+   "referenced_type" : "type-543",
+   "self_type" : "type-542",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-687",
+   "self_type" : "type-686",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10983,8 +11038,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-602",
-   "self_type" : "type-601",
+   "referenced_type" : "type-691",
+   "self_type" : "type-690",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10992,8 +11047,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-613",
+   "referenced_type" : "type-703",
+   "self_type" : "type-702",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -11001,8 +11056,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-624",
-   "self_type" : "type-623",
+   "referenced_type" : "type-713",
+   "self_type" : "type-712",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -11010,8 +11065,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-631",
-   "self_type" : "type-630",
+   "referenced_type" : "type-720",
+   "self_type" : "type-719",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -11019,8 +11074,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-670",
-   "self_type" : "type-669",
+   "referenced_type" : "type-759",
+   "self_type" : "type-758",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -11028,8 +11083,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-678",
-   "self_type" : "type-677",
+   "referenced_type" : "type-767",
+   "self_type" : "type-766",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -11037,8 +11092,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-683",
-   "self_type" : "type-682",
+   "referenced_type" : "type-772",
+   "self_type" : "type-771",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -11046,8 +11101,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-757",
-   "self_type" : "type-756",
+   "referenced_type" : "type-814",
+   "self_type" : "type-813",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -11172,8 +11227,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct **",
    "name" : "AAudioStreamStruct **",
-   "referenced_type" : "type-597",
-   "self_type" : "type-600",
+   "referenced_type" : "type-686",
+   "self_type" : "type-689",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -11299,7 +11354,7 @@
    "linker_set_key" : "aaudio::AAudioStreamConfiguration *",
    "name" : "aaudio::AAudioStreamConfiguration *",
    "referenced_type" : "type-150",
-   "self_type" : "type-727",
+   "self_type" : "type-515",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -11461,7 +11516,7 @@
    "linker_set_key" : "aaudio::RingBufferDescriptor_s *",
    "name" : "aaudio::RingBufferDescriptor_s *",
    "referenced_type" : "type-40",
-   "self_type" : "type-792",
+   "self_type" : "type-580",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11470,7 +11525,7 @@
    "linker_set_key" : "aaudio::RingBufferParcelable *",
    "name" : "aaudio::RingBufferParcelable *",
    "referenced_type" : "type-29",
-   "self_type" : "type-783",
+   "self_type" : "type-571",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11479,7 +11534,7 @@
    "linker_set_key" : "aaudio::SharedMemoryParcelable *",
    "name" : "aaudio::SharedMemoryParcelable *",
    "referenced_type" : "type-35",
-   "self_type" : "type-791",
+   "self_type" : "type-579",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11488,7 +11543,7 @@
    "linker_set_key" : "aaudio::SharedRegionParcelable *",
    "name" : "aaudio::SharedRegionParcelable *",
    "referenced_type" : "type-30",
-   "self_type" : "type-803",
+   "self_type" : "type-591",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -11497,7 +11552,7 @@
    "linker_set_key" : "android::BnAAudioClient *",
    "name" : "android::BnAAudioClient *",
    "referenced_type" : "type-165",
-   "self_type" : "type-748",
+   "self_type" : "type-536",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -11506,7 +11561,7 @@
    "linker_set_key" : "android::BnAAudioService *",
    "name" : "android::BnAAudioService *",
    "referenced_type" : "type-170",
-   "self_type" : "type-777",
+   "self_type" : "type-565",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -11559,8 +11614,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ExtendedTimestamp *",
    "name" : "android::ExtendedTimestamp *",
-   "referenced_type" : "type-620",
-   "self_type" : "type-619",
+   "referenced_type" : "type-709",
+   "self_type" : "type-708",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -11614,7 +11669,7 @@
    "linker_set_key" : "android::IAAudioClient *",
    "name" : "android::IAAudioClient *",
    "referenced_type" : "type-161",
-   "self_type" : "type-744",
+   "self_type" : "type-532",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -11623,7 +11678,7 @@
    "linker_set_key" : "android::IAAudioService *",
    "name" : "android::IAAudioService *",
    "referenced_type" : "type-168",
-   "self_type" : "type-773",
+   "self_type" : "type-561",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -11856,17 +11911,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-700",
-   "self_type" : "type-699",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel *",
-   "name" : "android::Parcel *",
-   "referenced_type" : "type-722",
-   "self_type" : "type-721",
+   "referenced_type" : "type-510",
+   "self_type" : "type-509",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -11874,8 +11920,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-730",
-   "self_type" : "type-729",
+   "referenced_type" : "type-518",
+   "self_type" : "type-517",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -11883,8 +11929,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-753",
-   "self_type" : "type-752",
+   "referenced_type" : "type-541",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -11892,8 +11938,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-782",
-   "self_type" : "type-781",
+   "referenced_type" : "type-570",
+   "self_type" : "type-569",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -11901,8 +11947,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-787",
-   "self_type" : "type-786",
+   "referenced_type" : "type-575",
+   "self_type" : "type-574",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11910,8 +11956,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-799",
-   "self_type" : "type-798",
+   "referenced_type" : "type-587",
+   "self_type" : "type-586",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -11919,13 +11965,22 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-807",
-   "self_type" : "type-806",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::Parcel *",
+   "name" : "android::Parcel *",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::WrappingBuffer *",
    "name" : "android::WrappingBuffer *",
    "referenced_type" : "type-205",
@@ -11965,7 +12020,7 @@
    "linker_set_key" : "const aaudio::AAudioStreamConfiguration *",
    "name" : "const aaudio::AAudioStreamConfiguration *",
    "referenced_type" : "type-159",
-   "self_type" : "type-728",
+   "self_type" : "type-516",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -12090,8 +12145,8 @@
    "alignment" : 4,
    "linker_set_key" : "const aaudio::RingBufferParcelable *",
    "name" : "const aaudio::RingBufferParcelable *",
-   "referenced_type" : "type-784",
-   "self_type" : "type-785",
+   "referenced_type" : "type-572",
+   "self_type" : "type-573",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -12099,8 +12154,8 @@
    "alignment" : 4,
    "linker_set_key" : "const aaudio::SharedMemoryParcelable *",
    "name" : "const aaudio::SharedMemoryParcelable *",
-   "referenced_type" : "type-796",
-   "self_type" : "type-797",
+   "referenced_type" : "type-584",
+   "self_type" : "type-585",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -12108,8 +12163,8 @@
    "alignment" : 4,
    "linker_set_key" : "const aaudio::SharedRegionParcelable *",
    "name" : "const aaudio::SharedRegionParcelable *",
-   "referenced_type" : "type-804",
-   "self_type" : "type-805",
+   "referenced_type" : "type-592",
+   "self_type" : "type-593",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -12126,8 +12181,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IAAudioClient *",
    "name" : "const android::IAAudioClient *",
-   "referenced_type" : "type-742",
-   "self_type" : "type-743",
+   "referenced_type" : "type-530",
+   "self_type" : "type-531",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12135,8 +12190,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IAAudioService *",
    "name" : "const android::IAAudioService *",
-   "referenced_type" : "type-771",
-   "self_type" : "type-772",
+   "referenced_type" : "type-559",
+   "self_type" : "type-560",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -12315,17 +12370,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-701",
-   "self_type" : "type-704",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Parcel *",
-   "name" : "const android::Parcel *",
-   "referenced_type" : "type-723",
-   "self_type" : "type-725",
+   "referenced_type" : "type-511",
+   "self_type" : "type-513",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -12333,8 +12379,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-731",
-   "self_type" : "type-733",
+   "referenced_type" : "type-519",
+   "self_type" : "type-521",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -12342,8 +12388,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-788",
-   "self_type" : "type-790",
+   "referenced_type" : "type-576",
+   "self_type" : "type-578",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -12351,8 +12397,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-800",
-   "self_type" : "type-802",
+   "referenced_type" : "type-588",
+   "self_type" : "type-590",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -12360,13 +12406,22 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-808",
-   "self_type" : "type-810",
+   "referenced_type" : "type-596",
+   "self_type" : "type-598",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::Parcel *",
+   "name" : "const android::Parcel *",
+   "referenced_type" : "type-790",
+   "self_type" : "type-793",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
    "referenced_type" : "type-209",
@@ -12639,8 +12694,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::atomic<long long> *",
    "name" : "std::atomic<long long> *",
-   "referenced_type" : "type-639",
-   "self_type" : "type-638",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/fifo/FifoControllerIndirect.h"
   },
@@ -12838,8 +12893,8 @@
    "is_const" : true,
    "linker_set_key" : "const aaudio::AudioStreamBuilder",
    "name" : "const aaudio::AudioStreamBuilder",
-   "referenced_type" : "type-686",
-   "self_type" : "type-685",
+   "referenced_type" : "type-775",
+   "self_type" : "type-774",
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
   {
@@ -12857,7 +12912,7 @@
    "name" : "const aaudio::AudioStreamInternal",
    "referenced_type" : "type-6",
    "self_type" : "type-65",
-   "size" : 1200,
+   "size" : 1208,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
   {
@@ -12867,7 +12922,7 @@
    "name" : "const aaudio::AudioStreamInternalCapture",
    "referenced_type" : "type-69",
    "self_type" : "type-70",
-   "size" : 1208,
+   "size" : 1216,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalCapture.h"
   },
   {
@@ -12877,7 +12932,7 @@
    "name" : "const aaudio::AudioStreamInternalPlay",
    "referenced_type" : "type-113",
    "self_type" : "type-114",
-   "size" : 1232,
+   "size" : 1240,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
   {
@@ -12917,7 +12972,7 @@
    "name" : "const aaudio::IsochronousClockModel",
    "referenced_type" : "type-7",
    "self_type" : "type-192",
-   "size" : 40,
+   "size" : 48,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
   },
   {
@@ -12926,7 +12981,7 @@
    "linker_set_key" : "const aaudio::RingBufferParcelable",
    "name" : "const aaudio::RingBufferParcelable",
    "referenced_type" : "type-29",
-   "self_type" : "type-784",
+   "self_type" : "type-572",
    "size" : 68,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -12936,7 +12991,7 @@
    "linker_set_key" : "const aaudio::SharedMemoryParcelable",
    "name" : "const aaudio::SharedMemoryParcelable",
    "referenced_type" : "type-35",
-   "self_type" : "type-796",
+   "self_type" : "type-584",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -12946,7 +13001,7 @@
    "linker_set_key" : "const aaudio::SharedRegionParcelable",
    "name" : "const aaudio::SharedRegionParcelable",
    "referenced_type" : "type-30",
-   "self_type" : "type-804",
+   "self_type" : "type-592",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -13105,8 +13160,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-582",
-   "self_type" : "type-581",
+   "referenced_type" : "type-548",
+   "self_type" : "type-547",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -13115,8 +13170,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-657",
-   "self_type" : "type-656",
+   "referenced_type" : "type-671",
+   "self_type" : "type-670",
+   "size" : 20,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::AudioClient",
+   "name" : "const android::AudioClient",
+   "referenced_type" : "type-746",
+   "self_type" : "type-745",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
@@ -13125,18 +13190,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-716",
-   "self_type" : "type-715",
-   "size" : 20,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::AudioClient",
-   "name" : "const android::AudioClient",
-   "referenced_type" : "type-760",
-   "self_type" : "type-759",
+   "referenced_type" : "type-805",
+   "self_type" : "type-804",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -13176,7 +13231,7 @@
    "linker_set_key" : "const android::IAAudioClient",
    "name" : "const android::IAAudioClient",
    "referenced_type" : "type-161",
-   "self_type" : "type-742",
+   "self_type" : "type-530",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13186,7 +13241,7 @@
    "linker_set_key" : "const android::IAAudioService",
    "name" : "const android::IAAudioService",
    "referenced_type" : "type-168",
-   "self_type" : "type-771",
+   "self_type" : "type-559",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -13445,18 +13500,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-702",
-   "self_type" : "type-701",
-   "size" : 60,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Parcel",
-   "name" : "const android::Parcel",
-   "referenced_type" : "type-724",
-   "self_type" : "type-723",
+   "referenced_type" : "type-512",
+   "self_type" : "type-511",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -13465,8 +13510,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-732",
-   "self_type" : "type-731",
+   "referenced_type" : "type-520",
+   "self_type" : "type-519",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -13475,8 +13520,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-750",
-   "self_type" : "type-749",
+   "referenced_type" : "type-538",
+   "self_type" : "type-537",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13485,8 +13530,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-779",
-   "self_type" : "type-778",
+   "referenced_type" : "type-567",
+   "self_type" : "type-566",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -13495,8 +13540,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-789",
-   "self_type" : "type-788",
+   "referenced_type" : "type-577",
+   "self_type" : "type-576",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -13505,8 +13550,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-801",
-   "self_type" : "type-800",
+   "referenced_type" : "type-589",
+   "self_type" : "type-588",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -13515,14 +13560,24 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-809",
-   "self_type" : "type-808",
+   "referenced_type" : "type-597",
+   "self_type" : "type-596",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::Parcel",
+   "name" : "const android::Parcel",
+   "referenced_type" : "type-791",
+   "self_type" : "type-790",
+   "size" : 60,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
    "referenced_type" : "type-1012",
@@ -13815,8 +13870,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-575",
-   "self_type" : "type-574",
+   "referenced_type" : "type-525",
+   "self_type" : "type-524",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13825,8 +13880,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-609",
-   "self_type" : "type-608",
+   "referenced_type" : "type-554",
+   "self_type" : "type-553",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13835,8 +13890,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-665",
-   "self_type" : "type-664",
+   "referenced_type" : "type-664",
+   "self_type" : "type-663",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13845,8 +13900,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-674",
-   "self_type" : "type-673",
+   "referenced_type" : "type-698",
+   "self_type" : "type-697",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13855,8 +13910,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-690",
-   "self_type" : "type-689",
+   "referenced_type" : "type-754",
+   "self_type" : "type-753",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13865,8 +13920,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-707",
-   "self_type" : "type-706",
+   "referenced_type" : "type-763",
+   "self_type" : "type-762",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13875,8 +13930,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-779",
+   "self_type" : "type-778",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13885,8 +13940,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
+   "referenced_type" : "type-796",
+   "self_type" : "type-795",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -14015,20 +14070,20 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-695",
-   "self_type" : "type-694",
+   "referenced_type" : "type-582",
+   "self_type" : "type-581",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-794",
-   "self_type" : "type-793",
+   "referenced_type" : "type-784",
+   "self_type" : "type-783",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
   {
    "alignment" : 4,
@@ -14425,8 +14480,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-511",
-   "self_type" : "type-510",
+   "referenced_type" : "type-523",
+   "self_type" : "type-522",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14435,8 +14490,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-585",
-   "self_type" : "type-584",
+   "referenced_type" : "type-674",
+   "self_type" : "type-673",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14445,8 +14500,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-606",
-   "self_type" : "type-605",
+   "referenced_type" : "type-695",
+   "self_type" : "type-694",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14455,8 +14510,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-612",
-   "self_type" : "type-611",
+   "referenced_type" : "type-701",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14465,8 +14520,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
+   "referenced_type" : "type-711",
+   "self_type" : "type-710",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14475,8 +14530,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-629",
-   "self_type" : "type-628",
+   "referenced_type" : "type-718",
+   "self_type" : "type-717",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14485,8 +14540,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-668",
-   "self_type" : "type-667",
+   "referenced_type" : "type-757",
+   "self_type" : "type-756",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14495,8 +14550,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-676",
-   "self_type" : "type-675",
+   "referenced_type" : "type-765",
+   "self_type" : "type-764",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14505,8 +14560,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-680",
-   "self_type" : "type-679",
+   "referenced_type" : "type-769",
+   "self_type" : "type-768",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14515,8 +14570,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-735",
-   "self_type" : "type-734",
+   "referenced_type" : "type-812",
+   "self_type" : "type-811",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -14805,8 +14860,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-644",
+   "self_type" : "type-643",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -14815,8 +14870,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-617",
-   "self_type" : "type-616",
+   "referenced_type" : "type-706",
+   "self_type" : "type-705",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -14825,8 +14880,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-626",
-   "self_type" : "type-625",
+   "referenced_type" : "type-715",
+   "self_type" : "type-714",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -14835,8 +14890,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-634",
-   "self_type" : "type-633",
+   "referenced_type" : "type-723",
+   "self_type" : "type-722",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -14895,8 +14950,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioClient>",
    "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-1060",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-1062",
+   "self_type" : "type-1061",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -14923,8 +14978,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioClient>",
    "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-1368",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1369",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -14991,30 +15046,30 @@
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::IAAudioClient>",
-   "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-579",
-   "self_type" : "type-578",
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioClient>",
    "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-711",
-   "self_type" : "type-710",
+   "referenced_type" : "type-545",
+   "self_type" : "type-544",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IAAudioClient>",
+   "name" : "const android::sp<android::IAAudioClient>",
+   "referenced_type" : "type-668",
+   "self_type" : "type-667",
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioClient>",
    "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-755",
-   "self_type" : "type-754",
+   "referenced_type" : "type-800",
+   "self_type" : "type-799",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -15051,8 +15106,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioService>",
    "name" : "const android::sp<android::IAAudioService>",
-   "referenced_type" : "type-1454",
-   "self_type" : "type-1453",
+   "referenced_type" : "type-1455",
+   "self_type" : "type-1454",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -15071,8 +15126,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioService>",
    "name" : "const android::sp<android::IAAudioService>",
-   "referenced_type" : "type-709",
-   "self_type" : "type-708",
+   "referenced_type" : "type-798",
+   "self_type" : "type-797",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -15141,8 +15196,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IBinder>",
    "name" : "const android::sp<android::IBinder>",
-   "referenced_type" : "type-739",
-   "self_type" : "type-738",
+   "referenced_type" : "type-527",
+   "self_type" : "type-526",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -15151,8 +15206,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IBinder>",
    "name" : "const android::sp<android::IBinder>",
-   "referenced_type" : "type-768",
-   "self_type" : "type-767",
+   "referenced_type" : "type-556",
+   "self_type" : "type-555",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -15256,24 +15311,24 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-588",
-   "self_type" : "type-587",
+   "referenced_type" : "type-551",
+   "self_type" : "type-550",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-719",
-   "self_type" : "type-718",
+   "referenced_type" : "type-677",
+   "self_type" : "type-676",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-763",
-   "self_type" : "type-762",
+   "referenced_type" : "type-808",
+   "self_type" : "type-807",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
@@ -15389,8 +15444,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> >",
    "name" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> >",
-   "referenced_type" : "type-747",
-   "self_type" : "type-746",
+   "referenced_type" : "type-535",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -15429,8 +15484,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> >",
    "name" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> >",
-   "referenced_type" : "type-776",
-   "self_type" : "type-775",
+   "referenced_type" : "type-564",
+   "self_type" : "type-563",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -17366,109 +17421,109 @@
     {
      "access" : "protected",
      "field_name" : "mAudioEndpoint",
-     "field_offset" : 1408,
+     "field_offset" : 1472,
      "referenced_type" : "type-10"
     },
     {
      "access" : "protected",
      "field_name" : "mServiceStreamHandle",
-     "field_offset" : 1664,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mFramesPerBurst",
-     "field_offset" : 1696,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mXRunCount",
      "field_offset" : 1728,
      "referenced_type" : "type-4"
     },
     {
      "access" : "protected",
-     "field_name" : "mFramesOffsetFromService",
+     "field_name" : "mFramesPerBurst",
+     "field_offset" : 1760,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mXRunCount",
      "field_offset" : 1792,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mFramesOffsetFromService",
+     "field_offset" : 1856,
      "referenced_type" : "type-8"
     },
     {
      "access" : "protected",
      "field_name" : "mCallbackBuffer",
-     "field_offset" : 1856,
+     "field_offset" : 1920,
      "referenced_type" : "type-14"
     },
     {
      "access" : "protected",
      "field_name" : "mCallbackFrames",
-     "field_offset" : 1888,
+     "field_offset" : 1952,
      "referenced_type" : "type-4"
     },
     {
      "access" : "protected",
      "field_name" : "mInService",
-     "field_offset" : 1920,
+     "field_offset" : 1984,
      "referenced_type" : "type-16"
     },
     {
      "access" : "protected",
      "field_name" : "mServiceInterface",
-     "field_offset" : 1952,
+     "field_offset" : 2016,
      "referenced_type" : "type-18"
     },
     {
      "access" : "protected",
      "field_name" : "mAtomicInternalTimestamp",
-     "field_offset" : 1984,
+     "field_offset" : 2048,
      "referenced_type" : "type-20"
     },
     {
      "access" : "protected",
      "field_name" : "mNeedCatchUp",
-     "field_offset" : 2304,
+     "field_offset" : 2368,
      "referenced_type" : "type-24"
     },
     {
      "access" : "protected",
      "field_name" : "mStreamVolume",
-     "field_offset" : 2368,
+     "field_offset" : 2432,
      "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mWakeupDelayNanos",
-     "field_offset" : 2400,
+     "field_offset" : 2464,
      "referenced_type" : "type-13"
     },
     {
      "access" : "private",
      "field_name" : "mMinimumSleepNanos",
-     "field_offset" : 2432,
+     "field_offset" : 2496,
      "referenced_type" : "type-13"
     },
     {
      "access" : "private",
      "field_name" : "mEndPointParcelable",
-     "field_offset" : 2464,
+     "field_offset" : 2528,
      "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mEndpointDescriptor",
-     "field_offset" : 8800,
+     "field_offset" : 8864,
      "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mServiceLatencyNanos",
-     "field_offset" : 9472,
+     "field_offset" : 9536,
      "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mDeviceChannelCount",
-     "field_offset" : 9536,
+     "field_offset" : 9600,
      "referenced_type" : "type-4"
     }
    ],
@@ -17477,7 +17532,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-6",
    "self_type" : "type-6",
-   "size" : 1200,
+   "size" : 1208,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h",
    "unique_id" : "_ZTSN6aaudio19AudioStreamInternalE",
    "vtable_components" :
@@ -17614,7 +17669,7 @@
     {
      "access" : "private",
      "field_name" : "mLastFramesWritten",
-     "field_offset" : 9600,
+     "field_offset" : 9664,
      "referenced_type" : "type-8"
     }
    ],
@@ -17623,7 +17678,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-69",
    "self_type" : "type-69",
-   "size" : 1208,
+   "size" : 1216,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalCapture.h",
    "unique_id" : "_ZTSN6aaudio26AudioStreamInternalCaptureE",
    "vtable_components" :
@@ -17754,13 +17809,13 @@
     {
      "access" : "private",
      "field_name" : "mLastFramesRead",
-     "field_offset" : 9600,
+     "field_offset" : 9664,
      "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mFlowGraph",
-     "field_offset" : 9664,
+     "field_offset" : 9728,
      "referenced_type" : "type-106"
     }
    ],
@@ -17769,7 +17824,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-113",
    "self_type" : "type-113",
-   "size" : 1232,
+   "size" : 1240,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h",
    "unique_id" : "_ZTSN6aaudio23AudioStreamInternalPlayE",
    "vtable_components" :
@@ -18566,15 +18621,27 @@
     },
     {
      "access" : "private",
-     "field_name" : "mMaxLatenessInNanos",
+     "field_name" : "mBurstPeriodNanos",
      "field_offset" : 256,
      "referenced_type" : "type-4"
     },
     {
      "access" : "private",
-     "field_name" : "mState",
+     "field_name" : "mMaxMeasuredLatenessNanos",
      "field_offset" : 288,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mState",
+     "field_offset" : 320,
      "referenced_type" : "type-9"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampCount",
+     "field_offset" : 352,
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "aaudio::IsochronousClockModel",
@@ -18582,7 +18649,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-7",
    "self_type" : "type-7",
-   "size" : 40,
+   "size" : 48,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h",
    "unique_id" : "_ZTSN6aaudio21IsochronousClockModelE",
    "vtable_components" :
diff --git a/29/64/x86/source-based/libaaudio.so.lsdump b/29/64/x86/source-based/libaaudio.so.lsdump
index 4feae1c..4d56d6a 100644
--- a/29/64/x86/source-based/libaaudio.so.lsdump
+++ b/29/64/x86/source-based/libaaudio.so.lsdump
@@ -1544,12 +1544,21 @@
    "name" : "_ZNK6aaudio21IsochronousClockModel21convertTimeToPositionEx"
   },
   {
+   "name" : "_ZNK6aaudio21IsochronousClockModel22getLateTimeOffsetNanosEv"
+  },
+  {
    "name" : "_ZNK6aaudio21IsochronousClockModel26convertDeltaPositionToTimeEx"
   },
   {
    "name" : "_ZNK6aaudio21IsochronousClockModel26convertDeltaTimeToPositionEx"
   },
   {
+   "name" : "_ZNK6aaudio21IsochronousClockModel27convertLatestTimeToPositionEx"
+  },
+  {
+   "name" : "_ZNK6aaudio21IsochronousClockModel27convertPositionToLatestTimeEx"
+  },
+  {
    "name" : "_ZNK6aaudio21IsochronousClockModel4dumpEv"
   },
   {
@@ -5286,7 +5295,7 @@
      "referenced_type" : "type-157"
     },
     {
-     "referenced_type" : "type-725"
+     "referenced_type" : "type-513"
     }
    ],
    "return_type" : "type-4",
@@ -5788,7 +5797,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     },
     {
      "referenced_type" : "type-4"
@@ -5810,7 +5819,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     },
     {
      "referenced_type" : "type-4"
@@ -5841,10 +5850,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     },
     {
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-578"
     }
    ],
    "return_type" : "type-4",
@@ -5857,7 +5866,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-4",
@@ -5870,7 +5879,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     },
     {
      "referenced_type" : "type-4"
@@ -5886,7 +5895,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-4",
@@ -5899,7 +5908,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     },
     {
      "referenced_type" : "type-4"
@@ -5915,7 +5924,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-4",
@@ -5928,7 +5937,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     },
     {
      "referenced_type" : "type-4"
@@ -5944,7 +5953,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-54",
@@ -5957,13 +5966,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     },
     {
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-792"
+     "referenced_type" : "type-580"
     }
    ],
    "return_type" : "type-4",
@@ -5976,7 +5985,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-54",
@@ -5989,7 +5998,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-54",
@@ -6002,7 +6011,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-54",
@@ -6015,7 +6024,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-54",
@@ -6028,7 +6037,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-571"
     }
    ],
    "return_type" : "type-54",
@@ -6303,7 +6312,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-4",
@@ -6316,10 +6325,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-802"
+     "referenced_type" : "type-590"
     }
    ],
    "return_type" : "type-4",
@@ -6333,10 +6342,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-795"
+     "referenced_type" : "type-583"
     }
    ],
    "return_type" : "type-4",
@@ -6349,7 +6358,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-54",
@@ -6362,7 +6371,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-4",
@@ -6375,10 +6384,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-795"
+     "referenced_type" : "type-583"
     },
     {
      "referenced_type" : "type-4"
@@ -6394,7 +6403,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     },
     {
      "referenced_type" : "type-4"
@@ -6416,7 +6425,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-54",
@@ -6429,7 +6438,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-54",
@@ -6442,7 +6451,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-54",
@@ -6455,7 +6464,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-54",
@@ -6468,7 +6477,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-54",
@@ -6481,10 +6490,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     },
     {
-     "referenced_type" : "type-810"
+     "referenced_type" : "type-598"
     }
    ],
    "return_type" : "type-4",
@@ -6497,7 +6506,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     }
    ],
    "return_type" : "type-54",
@@ -6510,7 +6519,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     },
     {
      "referenced_type" : "type-4"
@@ -6532,10 +6541,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     },
     {
-     "referenced_type" : "type-791"
+     "referenced_type" : "type-579"
     },
     {
      "referenced_type" : "type-258"
@@ -6551,7 +6560,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     }
    ],
    "return_type" : "type-54",
@@ -6564,7 +6573,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     }
    ],
    "return_type" : "type-54",
@@ -6577,7 +6586,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     }
    ],
    "return_type" : "type-54",
@@ -6590,7 +6599,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     }
    ],
    "return_type" : "type-54",
@@ -6603,7 +6612,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-803"
+     "referenced_type" : "type-591"
     }
    ],
    "return_type" : "type-54",
@@ -7028,10 +7037,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-515"
     },
     {
-     "referenced_type" : "type-733"
+     "referenced_type" : "type-521"
     }
    ],
    "return_type" : "type-4",
@@ -7044,7 +7053,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-515"
     }
    ],
    "return_type" : "type-54",
@@ -7057,7 +7066,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-515"
     }
    ],
    "return_type" : "type-54",
@@ -7070,7 +7079,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-515"
     }
    ],
    "return_type" : "type-54",
@@ -7083,7 +7092,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-515"
     }
    ],
    "return_type" : "type-54",
@@ -7096,7 +7105,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-515"
     }
    ],
    "return_type" : "type-54",
@@ -7592,16 +7601,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-740"
+     "referenced_type" : "type-528"
     }
    ],
-   "return_type" : "type-812",
+   "return_type" : "type-600",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
   {
    "function_name" : "android::IAAudioClient::getDefaultImpl",
    "linker_set_key" : "_ZN7android13IAAudioClient14getDefaultImplEv",
-   "return_type" : "type-745",
+   "return_type" : "type-533",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
   {
@@ -7610,7 +7619,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-813"
+     "referenced_type" : "type-601"
     }
    ],
    "return_type" : "type-16",
@@ -7623,7 +7632,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-532"
     }
    ],
    "return_type" : "type-54",
@@ -7636,7 +7645,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-532"
     }
    ],
    "return_type" : "type-54",
@@ -7649,7 +7658,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-532"
     }
    ],
    "return_type" : "type-54",
@@ -7662,7 +7671,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-532"
     }
    ],
    "return_type" : "type-54",
@@ -7675,16 +7684,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-748"
+     "referenced_type" : "type-536"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-751"
+     "referenced_type" : "type-539"
     },
     {
-     "referenced_type" : "type-752"
+     "referenced_type" : "type-540"
     },
     {
      "default_arg" : true,
@@ -7700,16 +7709,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-557"
     }
    ],
-   "return_type" : "type-814",
+   "return_type" : "type-602",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
   {
    "function_name" : "android::IAAudioService::getDefaultImpl",
    "linker_set_key" : "_ZN7android14IAAudioService14getDefaultImplEv",
-   "return_type" : "type-774",
+   "return_type" : "type-562",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
   {
@@ -7718,7 +7727,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-815"
+     "referenced_type" : "type-603"
     }
    ],
    "return_type" : "type-16",
@@ -7731,7 +7740,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-773"
+     "referenced_type" : "type-561"
     }
    ],
    "return_type" : "type-54",
@@ -7744,7 +7753,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-773"
+     "referenced_type" : "type-561"
     }
    ],
    "return_type" : "type-54",
@@ -7757,7 +7766,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-773"
+     "referenced_type" : "type-561"
     }
    ],
    "return_type" : "type-54",
@@ -7770,7 +7779,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-773"
+     "referenced_type" : "type-561"
     }
    ],
    "return_type" : "type-54",
@@ -7783,16 +7792,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-565"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-568"
     },
     {
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-569"
     },
     {
      "default_arg" : true,
@@ -8900,7 +8909,7 @@
      "referenced_type" : "type-156"
     },
     {
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-509"
     }
    ],
    "return_type" : "type-4",
@@ -8992,10 +9001,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-573"
     },
     {
-     "referenced_type" : "type-786"
+     "referenced_type" : "type-574"
     }
    ],
    "return_type" : "type-4",
@@ -9009,7 +9018,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-573"
     }
    ],
    "return_type" : "type-4",
@@ -9061,6 +9070,20 @@
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
   },
   {
+   "access" : "private",
+   "function_name" : "aaudio::IsochronousClockModel::getLateTimeOffsetNanos",
+   "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel22getLateTimeOffsetNanosEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-193"
+    }
+   ],
+   "return_type" : "type-4",
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
+  },
+  {
    "function_name" : "aaudio::IsochronousClockModel::convertDeltaPositionToTime",
    "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel26convertDeltaPositionToTimeEx",
    "parameters" :
@@ -9093,6 +9116,38 @@
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
   },
   {
+   "function_name" : "aaudio::IsochronousClockModel::convertLatestTimeToPosition",
+   "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel27convertLatestTimeToPositionEx",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-193"
+    },
+    {
+     "referenced_type" : "type-8"
+    }
+   ],
+   "return_type" : "type-8",
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
+  },
+  {
+   "function_name" : "aaudio::IsochronousClockModel::convertPositionToLatestTime",
+   "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel27convertPositionToLatestTimeEx",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-193"
+    },
+    {
+     "referenced_type" : "type-8"
+    }
+   ],
+   "return_type" : "type-8",
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
+  },
+  {
    "function_name" : "aaudio::IsochronousClockModel::dump",
    "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel4dumpEv",
    "parameters" :
@@ -9151,10 +9206,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-797"
+     "referenced_type" : "type-585"
     },
     {
-     "referenced_type" : "type-798"
+     "referenced_type" : "type-586"
     }
    ],
    "return_type" : "type-4",
@@ -9168,7 +9223,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-797"
+     "referenced_type" : "type-585"
     }
    ],
    "return_type" : "type-4",
@@ -9181,10 +9236,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-805"
+     "referenced_type" : "type-593"
     },
     {
-     "referenced_type" : "type-806"
+     "referenced_type" : "type-594"
     }
    ],
    "return_type" : "type-4",
@@ -9198,7 +9253,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-805"
+     "referenced_type" : "type-593"
     }
    ],
    "return_type" : "type-4",
@@ -9241,10 +9296,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-516"
     },
     {
-     "referenced_type" : "type-729"
+     "referenced_type" : "type-517"
     }
    ],
    "return_type" : "type-4",
@@ -9257,10 +9312,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-743"
+     "referenced_type" : "type-531"
     }
    ],
-   "return_type" : "type-741",
+   "return_type" : "type-529",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
   {
@@ -9270,10 +9325,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-772"
+     "referenced_type" : "type-560"
     }
    ],
-   "return_type" : "type-770",
+   "return_type" : "type-558",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
   {
@@ -9302,16 +9357,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-748"
+     "referenced_type" : "type-536"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-751"
+     "referenced_type" : "type-539"
     },
     {
-     "referenced_type" : "type-752"
+     "referenced_type" : "type-540"
     },
     {
      "default_arg" : true,
@@ -9328,16 +9383,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-565"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-568"
     },
     {
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-569"
     },
     {
      "default_arg" : true,
@@ -9354,10 +9409,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-515"
     },
     {
-     "referenced_type" : "type-733"
+     "referenced_type" : "type-521"
     }
    ],
    "return_type" : "type-4",
@@ -9370,10 +9425,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-516"
     },
     {
-     "referenced_type" : "type-729"
+     "referenced_type" : "type-517"
     }
    ],
    "return_type" : "type-4",
@@ -9514,8 +9569,8 @@
    "alignment" : 4,
    "linker_set_key" : "const aaudio::AudioStreamBuilder &",
    "name" : "const aaudio::AudioStreamBuilder &",
-   "referenced_type" : "type-685",
-   "self_type" : "type-687",
+   "referenced_type" : "type-774",
+   "self_type" : "type-776",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
@@ -9631,8 +9686,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AudioClient &",
    "name" : "const android::AudioClient &",
-   "referenced_type" : "type-581",
-   "self_type" : "type-583",
+   "referenced_type" : "type-547",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9640,8 +9695,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AudioClient &",
    "name" : "const android::AudioClient &",
-   "referenced_type" : "type-656",
-   "self_type" : "type-658",
+   "referenced_type" : "type-670",
+   "self_type" : "type-672",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AudioClient &",
+   "name" : "const android::AudioClient &",
+   "referenced_type" : "type-745",
+   "self_type" : "type-747",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
@@ -9649,17 +9713,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AudioClient &",
    "name" : "const android::AudioClient &",
-   "referenced_type" : "type-715",
-   "self_type" : "type-717",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AudioClient &",
-   "name" : "const android::AudioClient &",
-   "referenced_type" : "type-759",
-   "self_type" : "type-761",
+   "referenced_type" : "type-804",
+   "self_type" : "type-806",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9704,7 +9759,7 @@
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
    "referenced_type" : "type-1187",
-   "self_type" : "type-1189",
+   "self_type" : "type-1190",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -9721,8 +9776,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-749",
-   "self_type" : "type-751",
+   "referenced_type" : "type-537",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -9730,8 +9785,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-778",
-   "self_type" : "type-780",
+   "referenced_type" : "type-566",
+   "self_type" : "type-568",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -9758,7 +9813,7 @@
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
    "referenced_type" : "type-1173",
-   "self_type" : "type-1178",
+   "self_type" : "type-1179",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -9775,8 +9830,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-736",
-   "self_type" : "type-741",
+   "referenced_type" : "type-524",
+   "self_type" : "type-529",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -9784,8 +9839,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-765",
-   "self_type" : "type-770",
+   "referenced_type" : "type-553",
+   "self_type" : "type-558",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -9829,19 +9884,19 @@
    "alignment" : 4,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "referenced_type" : "type-694",
-   "self_type" : "type-696",
+   "referenced_type" : "type-581",
+   "self_type" : "type-583",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "referenced_type" : "type-793",
-   "self_type" : "type-795",
+   "referenced_type" : "type-783",
+   "self_type" : "type-785",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
   {
    "alignment" : 4,
@@ -9865,7 +9920,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-1059",
+   "referenced_type" : "type-1061",
    "self_type" : "type-1063",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
@@ -9937,8 +9992,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-578",
-   "self_type" : "type-580",
+   "referenced_type" : "type-544",
+   "self_type" : "type-546",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9946,8 +10001,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-710",
-   "self_type" : "type-712",
+   "referenced_type" : "type-667",
+   "self_type" : "type-669",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9955,8 +10010,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-754",
-   "self_type" : "type-758",
+   "referenced_type" : "type-799",
+   "self_type" : "type-801",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10009,8 +10064,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IBinder> &",
    "name" : "const android::sp<android::IBinder> &",
-   "referenced_type" : "type-738",
-   "self_type" : "type-740",
+   "referenced_type" : "type-526",
+   "self_type" : "type-528",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -10018,8 +10073,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IBinder> &",
    "name" : "const android::sp<android::IBinder> &",
-   "referenced_type" : "type-767",
-   "self_type" : "type-769",
+   "referenced_type" : "type-555",
+   "self_type" : "type-557",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -10108,8 +10163,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-587",
-   "self_type" : "type-589",
+   "referenced_type" : "type-550",
+   "self_type" : "type-552",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10117,8 +10172,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-718",
-   "self_type" : "type-720",
+   "referenced_type" : "type-676",
+   "self_type" : "type-678",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10126,8 +10181,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-762",
-   "self_type" : "type-764",
+   "referenced_type" : "type-807",
+   "self_type" : "type-809",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10162,8 +10217,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> > &",
    "name" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> > &",
-   "referenced_type" : "type-746",
-   "self_type" : "type-745",
+   "referenced_type" : "type-534",
+   "self_type" : "type-533",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -10189,8 +10244,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> > &",
    "name" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> > &",
-   "referenced_type" : "type-775",
-   "self_type" : "type-774",
+   "referenced_type" : "type-563",
+   "self_type" : "type-562",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -10255,8 +10310,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamBuilderStruct *",
    "name" : "AAudioStreamBuilderStruct *",
-   "referenced_type" : "type-604",
-   "self_type" : "type-603",
+   "referenced_type" : "type-693",
+   "self_type" : "type-692",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10309,8 +10364,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamBuilderStruct **",
    "name" : "AAudioStreamBuilderStruct **",
-   "referenced_type" : "type-603",
-   "self_type" : "type-607",
+   "referenced_type" : "type-692",
+   "self_type" : "type-696",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10327,8 +10382,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-1062",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-1060",
+   "self_type" : "type-1059",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10588,15 +10643,6 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-513",
-   "self_type" : "type-512",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
    "referenced_type" : "type-52",
    "self_type" : "type-51",
    "size" : 4,
@@ -10606,8 +10652,17 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
+   "referenced_type" : "type-543",
+   "self_type" : "type-542",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-687",
+   "self_type" : "type-686",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10615,8 +10670,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-602",
-   "self_type" : "type-601",
+   "referenced_type" : "type-691",
+   "self_type" : "type-690",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10624,8 +10679,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-613",
+   "referenced_type" : "type-703",
+   "self_type" : "type-702",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10633,8 +10688,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-624",
-   "self_type" : "type-623",
+   "referenced_type" : "type-713",
+   "self_type" : "type-712",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10642,8 +10697,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-631",
-   "self_type" : "type-630",
+   "referenced_type" : "type-720",
+   "self_type" : "type-719",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10651,8 +10706,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-670",
-   "self_type" : "type-669",
+   "referenced_type" : "type-759",
+   "self_type" : "type-758",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10660,8 +10715,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-678",
-   "self_type" : "type-677",
+   "referenced_type" : "type-767",
+   "self_type" : "type-766",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10669,8 +10724,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-683",
-   "self_type" : "type-682",
+   "referenced_type" : "type-772",
+   "self_type" : "type-771",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10678,8 +10733,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-757",
-   "self_type" : "type-756",
+   "referenced_type" : "type-814",
+   "self_type" : "type-813",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10795,8 +10850,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct **",
    "name" : "AAudioStreamStruct **",
-   "referenced_type" : "type-597",
-   "self_type" : "type-600",
+   "referenced_type" : "type-686",
+   "self_type" : "type-689",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10922,7 +10977,7 @@
    "linker_set_key" : "aaudio::AAudioStreamConfiguration *",
    "name" : "aaudio::AAudioStreamConfiguration *",
    "referenced_type" : "type-150",
-   "self_type" : "type-727",
+   "self_type" : "type-515",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -11084,7 +11139,7 @@
    "linker_set_key" : "aaudio::RingBufferDescriptor_s *",
    "name" : "aaudio::RingBufferDescriptor_s *",
    "referenced_type" : "type-40",
-   "self_type" : "type-792",
+   "self_type" : "type-580",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11093,7 +11148,7 @@
    "linker_set_key" : "aaudio::RingBufferParcelable *",
    "name" : "aaudio::RingBufferParcelable *",
    "referenced_type" : "type-29",
-   "self_type" : "type-783",
+   "self_type" : "type-571",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11102,7 +11157,7 @@
    "linker_set_key" : "aaudio::SharedMemoryParcelable *",
    "name" : "aaudio::SharedMemoryParcelable *",
    "referenced_type" : "type-35",
-   "self_type" : "type-791",
+   "self_type" : "type-579",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11111,7 +11166,7 @@
    "linker_set_key" : "aaudio::SharedRegionParcelable *",
    "name" : "aaudio::SharedRegionParcelable *",
    "referenced_type" : "type-30",
-   "self_type" : "type-803",
+   "self_type" : "type-591",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -11120,7 +11175,7 @@
    "linker_set_key" : "android::BnAAudioClient *",
    "name" : "android::BnAAudioClient *",
    "referenced_type" : "type-165",
-   "self_type" : "type-748",
+   "self_type" : "type-536",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -11129,7 +11184,7 @@
    "linker_set_key" : "android::BnAAudioService *",
    "name" : "android::BnAAudioService *",
    "referenced_type" : "type-170",
-   "self_type" : "type-777",
+   "self_type" : "type-565",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -11173,8 +11228,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ExtendedTimestamp *",
    "name" : "android::ExtendedTimestamp *",
-   "referenced_type" : "type-620",
-   "self_type" : "type-619",
+   "referenced_type" : "type-709",
+   "self_type" : "type-708",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -11228,7 +11283,7 @@
    "linker_set_key" : "android::IAAudioClient *",
    "name" : "android::IAAudioClient *",
    "referenced_type" : "type-161",
-   "self_type" : "type-744",
+   "self_type" : "type-532",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -11237,7 +11292,7 @@
    "linker_set_key" : "android::IAAudioService *",
    "name" : "android::IAAudioService *",
    "referenced_type" : "type-168",
-   "self_type" : "type-773",
+   "self_type" : "type-561",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -11398,17 +11453,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-700",
-   "self_type" : "type-699",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel *",
-   "name" : "android::Parcel *",
-   "referenced_type" : "type-722",
-   "self_type" : "type-721",
+   "referenced_type" : "type-510",
+   "self_type" : "type-509",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -11416,8 +11462,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-730",
-   "self_type" : "type-729",
+   "referenced_type" : "type-518",
+   "self_type" : "type-517",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -11425,8 +11471,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-753",
-   "self_type" : "type-752",
+   "referenced_type" : "type-541",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -11434,8 +11480,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-782",
-   "self_type" : "type-781",
+   "referenced_type" : "type-570",
+   "self_type" : "type-569",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -11443,8 +11489,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-787",
-   "self_type" : "type-786",
+   "referenced_type" : "type-575",
+   "self_type" : "type-574",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11452,8 +11498,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-799",
-   "self_type" : "type-798",
+   "referenced_type" : "type-587",
+   "self_type" : "type-586",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -11461,13 +11507,22 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-807",
-   "self_type" : "type-806",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::Parcel *",
+   "name" : "android::Parcel *",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::WrappingBuffer *",
    "name" : "android::WrappingBuffer *",
    "referenced_type" : "type-205",
@@ -11507,7 +11562,7 @@
    "linker_set_key" : "const aaudio::AAudioStreamConfiguration *",
    "name" : "const aaudio::AAudioStreamConfiguration *",
    "referenced_type" : "type-159",
-   "self_type" : "type-728",
+   "self_type" : "type-516",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -11632,8 +11687,8 @@
    "alignment" : 4,
    "linker_set_key" : "const aaudio::RingBufferParcelable *",
    "name" : "const aaudio::RingBufferParcelable *",
-   "referenced_type" : "type-784",
-   "self_type" : "type-785",
+   "referenced_type" : "type-572",
+   "self_type" : "type-573",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11641,8 +11696,8 @@
    "alignment" : 4,
    "linker_set_key" : "const aaudio::SharedMemoryParcelable *",
    "name" : "const aaudio::SharedMemoryParcelable *",
-   "referenced_type" : "type-796",
-   "self_type" : "type-797",
+   "referenced_type" : "type-584",
+   "self_type" : "type-585",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -11650,8 +11705,8 @@
    "alignment" : 4,
    "linker_set_key" : "const aaudio::SharedRegionParcelable *",
    "name" : "const aaudio::SharedRegionParcelable *",
-   "referenced_type" : "type-804",
-   "self_type" : "type-805",
+   "referenced_type" : "type-592",
+   "self_type" : "type-593",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -11668,8 +11723,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IAAudioClient *",
    "name" : "const android::IAAudioClient *",
-   "referenced_type" : "type-742",
-   "self_type" : "type-743",
+   "referenced_type" : "type-530",
+   "self_type" : "type-531",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -11677,8 +11732,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IAAudioService *",
    "name" : "const android::IAAudioService *",
-   "referenced_type" : "type-771",
-   "self_type" : "type-772",
+   "referenced_type" : "type-559",
+   "self_type" : "type-560",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -11803,17 +11858,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-701",
-   "self_type" : "type-704",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Parcel *",
-   "name" : "const android::Parcel *",
-   "referenced_type" : "type-723",
-   "self_type" : "type-725",
+   "referenced_type" : "type-511",
+   "self_type" : "type-513",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -11821,8 +11867,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-731",
-   "self_type" : "type-733",
+   "referenced_type" : "type-519",
+   "self_type" : "type-521",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -11830,8 +11876,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-788",
-   "self_type" : "type-790",
+   "referenced_type" : "type-576",
+   "self_type" : "type-578",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11839,8 +11885,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-800",
-   "self_type" : "type-802",
+   "referenced_type" : "type-588",
+   "self_type" : "type-590",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -11848,13 +11894,22 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-808",
-   "self_type" : "type-810",
+   "referenced_type" : "type-596",
+   "self_type" : "type-598",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::Parcel *",
+   "name" : "const android::Parcel *",
+   "referenced_type" : "type-790",
+   "self_type" : "type-793",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
    "referenced_type" : "type-209",
@@ -12118,8 +12173,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::atomic<long long> *",
    "name" : "std::atomic<long long> *",
-   "referenced_type" : "type-639",
-   "self_type" : "type-638",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/fifo/FifoControllerIndirect.h"
   },
@@ -12309,8 +12364,8 @@
    "is_const" : true,
    "linker_set_key" : "const aaudio::AudioStreamBuilder",
    "name" : "const aaudio::AudioStreamBuilder",
-   "referenced_type" : "type-686",
-   "self_type" : "type-685",
+   "referenced_type" : "type-775",
+   "self_type" : "type-774",
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
   {
@@ -12328,7 +12383,7 @@
    "name" : "const aaudio::AudioStreamInternal",
    "referenced_type" : "type-6",
    "self_type" : "type-65",
-   "size" : 1184,
+   "size" : 1192,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
   {
@@ -12338,7 +12393,7 @@
    "name" : "const aaudio::AudioStreamInternalCapture",
    "referenced_type" : "type-69",
    "self_type" : "type-70",
-   "size" : 1192,
+   "size" : 1200,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalCapture.h"
   },
   {
@@ -12348,7 +12403,7 @@
    "name" : "const aaudio::AudioStreamInternalPlay",
    "referenced_type" : "type-113",
    "self_type" : "type-114",
-   "size" : 1216,
+   "size" : 1224,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
   {
@@ -12388,7 +12443,7 @@
    "name" : "const aaudio::IsochronousClockModel",
    "referenced_type" : "type-7",
    "self_type" : "type-192",
-   "size" : 36,
+   "size" : 44,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
   },
   {
@@ -12397,7 +12452,7 @@
    "linker_set_key" : "const aaudio::RingBufferParcelable",
    "name" : "const aaudio::RingBufferParcelable",
    "referenced_type" : "type-29",
-   "self_type" : "type-784",
+   "self_type" : "type-572",
    "size" : 68,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -12407,7 +12462,7 @@
    "linker_set_key" : "const aaudio::SharedMemoryParcelable",
    "name" : "const aaudio::SharedMemoryParcelable",
    "referenced_type" : "type-35",
-   "self_type" : "type-796",
+   "self_type" : "type-584",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -12417,7 +12472,7 @@
    "linker_set_key" : "const aaudio::SharedRegionParcelable",
    "name" : "const aaudio::SharedRegionParcelable",
    "referenced_type" : "type-30",
-   "self_type" : "type-804",
+   "self_type" : "type-592",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -12536,8 +12591,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-582",
-   "self_type" : "type-581",
+   "referenced_type" : "type-548",
+   "self_type" : "type-547",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -12546,8 +12601,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-657",
-   "self_type" : "type-656",
+   "referenced_type" : "type-671",
+   "self_type" : "type-670",
+   "size" : 20,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::AudioClient",
+   "name" : "const android::AudioClient",
+   "referenced_type" : "type-746",
+   "self_type" : "type-745",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
@@ -12556,18 +12621,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-716",
-   "self_type" : "type-715",
-   "size" : 20,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::AudioClient",
-   "name" : "const android::AudioClient",
-   "referenced_type" : "type-760",
-   "self_type" : "type-759",
+   "referenced_type" : "type-805",
+   "self_type" : "type-804",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -12607,7 +12662,7 @@
    "linker_set_key" : "const android::IAAudioClient",
    "name" : "const android::IAAudioClient",
    "referenced_type" : "type-161",
-   "self_type" : "type-742",
+   "self_type" : "type-530",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12617,7 +12672,7 @@
    "linker_set_key" : "const android::IAAudioService",
    "name" : "const android::IAAudioService",
    "referenced_type" : "type-168",
-   "self_type" : "type-771",
+   "self_type" : "type-559",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -12796,18 +12851,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-702",
-   "self_type" : "type-701",
-   "size" : 60,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Parcel",
-   "name" : "const android::Parcel",
-   "referenced_type" : "type-724",
-   "self_type" : "type-723",
+   "referenced_type" : "type-512",
+   "self_type" : "type-511",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -12816,8 +12861,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-732",
-   "self_type" : "type-731",
+   "referenced_type" : "type-520",
+   "self_type" : "type-519",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -12826,8 +12871,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-750",
-   "self_type" : "type-749",
+   "referenced_type" : "type-538",
+   "self_type" : "type-537",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12836,8 +12881,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-779",
-   "self_type" : "type-778",
+   "referenced_type" : "type-567",
+   "self_type" : "type-566",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -12846,8 +12891,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-789",
-   "self_type" : "type-788",
+   "referenced_type" : "type-577",
+   "self_type" : "type-576",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -12856,8 +12901,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-801",
-   "self_type" : "type-800",
+   "referenced_type" : "type-589",
+   "self_type" : "type-588",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -12866,14 +12911,24 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-809",
-   "self_type" : "type-808",
+   "referenced_type" : "type-597",
+   "self_type" : "type-596",
    "size" : 60,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::Parcel",
+   "name" : "const android::Parcel",
+   "referenced_type" : "type-791",
+   "self_type" : "type-790",
+   "size" : 60,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
    "referenced_type" : "type-1012",
@@ -13086,8 +13141,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-575",
-   "self_type" : "type-574",
+   "referenced_type" : "type-525",
+   "self_type" : "type-524",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13096,8 +13151,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-609",
-   "self_type" : "type-608",
+   "referenced_type" : "type-554",
+   "self_type" : "type-553",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13106,8 +13161,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-665",
-   "self_type" : "type-664",
+   "referenced_type" : "type-664",
+   "self_type" : "type-663",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13116,8 +13171,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-674",
-   "self_type" : "type-673",
+   "referenced_type" : "type-698",
+   "self_type" : "type-697",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13126,8 +13181,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-690",
-   "self_type" : "type-689",
+   "referenced_type" : "type-754",
+   "self_type" : "type-753",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13136,8 +13191,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-707",
-   "self_type" : "type-706",
+   "referenced_type" : "type-763",
+   "self_type" : "type-762",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13146,8 +13201,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-779",
+   "self_type" : "type-778",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13156,8 +13211,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
+   "referenced_type" : "type-796",
+   "self_type" : "type-795",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13266,20 +13321,20 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-695",
-   "self_type" : "type-694",
+   "referenced_type" : "type-582",
+   "self_type" : "type-581",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-794",
-   "self_type" : "type-793",
+   "referenced_type" : "type-784",
+   "self_type" : "type-783",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
   {
    "alignment" : 4,
@@ -13586,8 +13641,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-511",
-   "self_type" : "type-510",
+   "referenced_type" : "type-523",
+   "self_type" : "type-522",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13596,8 +13651,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-585",
-   "self_type" : "type-584",
+   "referenced_type" : "type-674",
+   "self_type" : "type-673",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13606,8 +13661,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-606",
-   "self_type" : "type-605",
+   "referenced_type" : "type-695",
+   "self_type" : "type-694",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13616,8 +13671,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-612",
-   "self_type" : "type-611",
+   "referenced_type" : "type-701",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13626,8 +13681,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
+   "referenced_type" : "type-711",
+   "self_type" : "type-710",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13636,8 +13691,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-629",
-   "self_type" : "type-628",
+   "referenced_type" : "type-718",
+   "self_type" : "type-717",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13646,8 +13701,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-668",
-   "self_type" : "type-667",
+   "referenced_type" : "type-757",
+   "self_type" : "type-756",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13656,8 +13711,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-676",
-   "self_type" : "type-675",
+   "referenced_type" : "type-765",
+   "self_type" : "type-764",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13666,8 +13721,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-680",
-   "self_type" : "type-679",
+   "referenced_type" : "type-769",
+   "self_type" : "type-768",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13676,8 +13731,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-735",
-   "self_type" : "type-734",
+   "referenced_type" : "type-812",
+   "self_type" : "type-811",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13926,8 +13981,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-644",
+   "self_type" : "type-643",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -13936,8 +13991,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-617",
-   "self_type" : "type-616",
+   "referenced_type" : "type-706",
+   "self_type" : "type-705",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -13946,8 +14001,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-626",
-   "self_type" : "type-625",
+   "referenced_type" : "type-715",
+   "self_type" : "type-714",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -13956,8 +14011,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-634",
-   "self_type" : "type-633",
+   "referenced_type" : "type-723",
+   "self_type" : "type-722",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -14016,8 +14071,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioClient>",
    "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-1060",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-1062",
+   "self_type" : "type-1061",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -14084,30 +14139,30 @@
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::IAAudioClient>",
-   "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-579",
-   "self_type" : "type-578",
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioClient>",
    "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-711",
-   "self_type" : "type-710",
+   "referenced_type" : "type-545",
+   "self_type" : "type-544",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IAAudioClient>",
+   "name" : "const android::sp<android::IAAudioClient>",
+   "referenced_type" : "type-668",
+   "self_type" : "type-667",
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioClient>",
    "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-755",
-   "self_type" : "type-754",
+   "referenced_type" : "type-800",
+   "self_type" : "type-799",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -14134,8 +14189,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioService>",
    "name" : "const android::sp<android::IAAudioService>",
-   "referenced_type" : "type-1146",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-1147",
+   "self_type" : "type-1146",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -14154,8 +14209,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioService>",
    "name" : "const android::sp<android::IAAudioService>",
-   "referenced_type" : "type-709",
-   "self_type" : "type-708",
+   "referenced_type" : "type-798",
+   "self_type" : "type-797",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -14204,8 +14259,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IBinder>",
    "name" : "const android::sp<android::IBinder>",
-   "referenced_type" : "type-739",
-   "self_type" : "type-738",
+   "referenced_type" : "type-527",
+   "self_type" : "type-526",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -14214,8 +14269,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IBinder>",
    "name" : "const android::sp<android::IBinder>",
-   "referenced_type" : "type-768",
-   "self_type" : "type-767",
+   "referenced_type" : "type-556",
+   "self_type" : "type-555",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -14295,24 +14350,24 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-588",
-   "self_type" : "type-587",
+   "referenced_type" : "type-551",
+   "self_type" : "type-550",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-719",
-   "self_type" : "type-718",
+   "referenced_type" : "type-677",
+   "self_type" : "type-676",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-763",
-   "self_type" : "type-762",
+   "referenced_type" : "type-808",
+   "self_type" : "type-807",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
@@ -14418,8 +14473,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> >",
    "name" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> >",
-   "referenced_type" : "type-747",
-   "self_type" : "type-746",
+   "referenced_type" : "type-535",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -14448,8 +14503,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> >",
    "name" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> >",
-   "referenced_type" : "type-776",
-   "self_type" : "type-775",
+   "referenced_type" : "type-564",
+   "self_type" : "type-563",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -16385,109 +16440,109 @@
     {
      "access" : "protected",
      "field_name" : "mAudioEndpoint",
-     "field_offset" : 1376,
+     "field_offset" : 1440,
      "referenced_type" : "type-10"
     },
     {
      "access" : "protected",
      "field_name" : "mServiceStreamHandle",
-     "field_offset" : 1632,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mFramesPerBurst",
-     "field_offset" : 1664,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mXRunCount",
      "field_offset" : 1696,
      "referenced_type" : "type-4"
     },
     {
      "access" : "protected",
-     "field_name" : "mFramesOffsetFromService",
+     "field_name" : "mFramesPerBurst",
      "field_offset" : 1728,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mXRunCount",
+     "field_offset" : 1760,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mFramesOffsetFromService",
+     "field_offset" : 1792,
      "referenced_type" : "type-8"
     },
     {
      "access" : "protected",
      "field_name" : "mCallbackBuffer",
-     "field_offset" : 1792,
+     "field_offset" : 1856,
      "referenced_type" : "type-14"
     },
     {
      "access" : "protected",
      "field_name" : "mCallbackFrames",
-     "field_offset" : 1824,
+     "field_offset" : 1888,
      "referenced_type" : "type-4"
     },
     {
      "access" : "protected",
      "field_name" : "mInService",
-     "field_offset" : 1856,
+     "field_offset" : 1920,
      "referenced_type" : "type-16"
     },
     {
      "access" : "protected",
      "field_name" : "mServiceInterface",
-     "field_offset" : 1888,
+     "field_offset" : 1952,
      "referenced_type" : "type-18"
     },
     {
      "access" : "protected",
      "field_name" : "mAtomicInternalTimestamp",
-     "field_offset" : 1920,
+     "field_offset" : 1984,
      "referenced_type" : "type-20"
     },
     {
      "access" : "protected",
      "field_name" : "mNeedCatchUp",
-     "field_offset" : 2208,
+     "field_offset" : 2272,
      "referenced_type" : "type-24"
     },
     {
      "access" : "protected",
      "field_name" : "mStreamVolume",
-     "field_offset" : 2272,
+     "field_offset" : 2336,
      "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mWakeupDelayNanos",
-     "field_offset" : 2304,
+     "field_offset" : 2368,
      "referenced_type" : "type-13"
     },
     {
      "access" : "private",
      "field_name" : "mMinimumSleepNanos",
-     "field_offset" : 2336,
+     "field_offset" : 2400,
      "referenced_type" : "type-13"
     },
     {
      "access" : "private",
      "field_name" : "mEndPointParcelable",
-     "field_offset" : 2368,
+     "field_offset" : 2432,
      "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mEndpointDescriptor",
-     "field_offset" : 8704,
+     "field_offset" : 8768,
      "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mServiceLatencyNanos",
-     "field_offset" : 9376,
+     "field_offset" : 9440,
      "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mDeviceChannelCount",
-     "field_offset" : 9440,
+     "field_offset" : 9504,
      "referenced_type" : "type-4"
     }
    ],
@@ -16496,7 +16551,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-6",
    "self_type" : "type-6",
-   "size" : 1184,
+   "size" : 1192,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h",
    "unique_id" : "_ZTSN6aaudio19AudioStreamInternalE",
    "vtable_components" :
@@ -16633,7 +16688,7 @@
     {
      "access" : "private",
      "field_name" : "mLastFramesWritten",
-     "field_offset" : 9472,
+     "field_offset" : 9536,
      "referenced_type" : "type-8"
     }
    ],
@@ -16642,7 +16697,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-69",
    "self_type" : "type-69",
-   "size" : 1192,
+   "size" : 1200,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalCapture.h",
    "unique_id" : "_ZTSN6aaudio26AudioStreamInternalCaptureE",
    "vtable_components" :
@@ -16773,13 +16828,13 @@
     {
      "access" : "private",
      "field_name" : "mLastFramesRead",
-     "field_offset" : 9472,
+     "field_offset" : 9536,
      "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mFlowGraph",
-     "field_offset" : 9536,
+     "field_offset" : 9600,
      "referenced_type" : "type-106"
     }
    ],
@@ -16788,7 +16843,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-113",
    "self_type" : "type-113",
-   "size" : 1216,
+   "size" : 1224,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h",
    "unique_id" : "_ZTSN6aaudio23AudioStreamInternalPlayE",
    "vtable_components" :
@@ -17585,15 +17640,27 @@
     },
     {
      "access" : "private",
-     "field_name" : "mMaxLatenessInNanos",
+     "field_name" : "mBurstPeriodNanos",
      "field_offset" : 224,
      "referenced_type" : "type-4"
     },
     {
      "access" : "private",
-     "field_name" : "mState",
+     "field_name" : "mMaxMeasuredLatenessNanos",
      "field_offset" : 256,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mState",
+     "field_offset" : 288,
      "referenced_type" : "type-9"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampCount",
+     "field_offset" : 320,
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "aaudio::IsochronousClockModel",
@@ -17601,7 +17668,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-7",
    "self_type" : "type-7",
-   "size" : 36,
+   "size" : 44,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h",
    "unique_id" : "_ZTSN6aaudio21IsochronousClockModelE",
    "vtable_components" :
diff --git a/29/64/x86_64/source-based/libaaudio.so.lsdump b/29/64/x86_64/source-based/libaaudio.so.lsdump
index c88d998..f7ad8ca 100644
--- a/29/64/x86_64/source-based/libaaudio.so.lsdump
+++ b/29/64/x86_64/source-based/libaaudio.so.lsdump
@@ -24,7 +24,7 @@
    "linker_set_key" : "int [2]",
    "name" : "int [2]",
    "referenced_type" : "type-4",
-   "self_type" : "type-329",
+   "self_type" : "type-206",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/fifo/FifoBuffer.h"
   },
@@ -33,7 +33,7 @@
    "linker_set_key" : "void *[2]",
    "name" : "void *[2]",
    "referenced_type" : "type-53",
-   "self_type" : "type-328",
+   "self_type" : "type-205",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libaaudio/src/fifo/FifoBuffer.h"
   }
@@ -55,16 +55,16 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
+   "referenced_type" : "type-209",
+   "self_type" : "type-209",
    "size" : 1
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-320",
-   "self_type" : "type-320",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 8
   },
   {
@@ -119,8 +119,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
+   "referenced_type" : "type-446",
+   "self_type" : "type-446",
    "size" : 8
   },
   {
@@ -1535,12 +1535,21 @@
    "name" : "_ZNK6aaudio21IsochronousClockModel21convertTimeToPositionEl"
   },
   {
+   "name" : "_ZNK6aaudio21IsochronousClockModel22getLateTimeOffsetNanosEv"
+  },
+  {
    "name" : "_ZNK6aaudio21IsochronousClockModel26convertDeltaPositionToTimeEl"
   },
   {
    "name" : "_ZNK6aaudio21IsochronousClockModel26convertDeltaTimeToPositionEl"
   },
   {
+   "name" : "_ZNK6aaudio21IsochronousClockModel27convertLatestTimeToPositionEl"
+  },
+  {
+   "name" : "_ZNK6aaudio21IsochronousClockModel27convertPositionToLatestTimeEl"
+  },
+  {
    "name" : "_ZNK6aaudio21IsochronousClockModel4dumpEv"
   },
   {
@@ -2003,8 +2012,8 @@
    ],
    "linker_set_key" : "aaudio::AAudioServiceMessage_s::code",
    "name" : "aaudio::AAudioServiceMessage_s::code",
-   "referenced_type" : "type-322",
-   "self_type" : "type-322",
+   "referenced_type" : "type-199",
+   "self_type" : "type-199",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioServiceMessage.h",
    "underlying_type" : "type-1",
@@ -2114,8 +2123,8 @@
    ],
    "linker_set_key" : "aaudio::aaudio_service_event_e",
    "name" : "aaudio::aaudio_service_event_e",
-   "referenced_type" : "type-317",
-   "self_type" : "type-317",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioServiceMessage.h",
    "underlying_type" : "type-1",
@@ -2132,8 +2141,8 @@
    ],
    "linker_set_key" : "android::aaudio_client_commands_t",
    "name" : "android::aaudio_client_commands_t",
-   "referenced_type" : "type-286",
-   "self_type" : "type-286",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioServiceDefinitions.h",
    "underlying_type" : "type-1",
@@ -2186,8 +2195,8 @@
    ],
    "linker_set_key" : "android::aaudio_service_commands_t",
    "name" : "android::aaudio_service_commands_t",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-276",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioServiceDefinitions.h",
    "underlying_type" : "type-1",
@@ -2257,9 +2266,9 @@
      "referenced_type" : "type-53"
     }
    ],
-   "referenced_type" : "type-351",
+   "referenced_type" : "type-228",
    "return_type" : "type-54",
-   "self_type" : "type-351",
+   "self_type" : "type-228",
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
   {
@@ -2286,7 +2295,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-213"
     }
    ],
    "return_type" : "type-4",
@@ -2298,10 +2307,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-213"
     },
     {
-     "referenced_type" : "type-335"
+     "referenced_type" : "type-212"
     }
    ],
    "return_type" : "type-4",
@@ -2313,7 +2322,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-213"
     },
     {
      "referenced_type" : "type-4"
@@ -2328,7 +2337,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-213"
     },
     {
      "referenced_type" : "type-4"
@@ -2343,7 +2352,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-213"
     },
     {
      "referenced_type" : "type-4"
@@ -2358,7 +2367,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-213"
     },
     {
      "referenced_type" : "type-4"
@@ -2373,7 +2382,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-213"
     },
     {
      "referenced_type" : "type-49"
@@ -2391,7 +2400,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-213"
     },
     {
      "referenced_type" : "type-4"
@@ -2406,7 +2415,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-213"
     },
     {
      "referenced_type" : "type-4"
@@ -2421,7 +2430,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-213"
     },
     {
      "referenced_type" : "type-56"
@@ -2439,7 +2448,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-213"
     },
     {
      "referenced_type" : "type-4"
@@ -2454,7 +2463,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-213"
     },
     {
      "referenced_type" : "type-4"
@@ -2469,7 +2478,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-213"
     },
     {
      "referenced_type" : "type-4"
@@ -2484,7 +2493,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-213"
     },
     {
      "referenced_type" : "type-4"
@@ -2499,7 +2508,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-213"
     },
     {
      "referenced_type" : "type-4"
@@ -2514,7 +2523,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-213"
     },
     {
      "referenced_type" : "type-4"
@@ -2529,7 +2538,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-213"
     },
     {
      "referenced_type" : "type-4"
@@ -2544,7 +2553,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-213"
     },
     {
      "referenced_type" : "type-4"
@@ -2559,7 +2568,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-213"
     },
     {
      "referenced_type" : "type-4"
@@ -2574,7 +2583,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     }
    ],
    "return_type" : "type-4",
@@ -2586,7 +2595,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     }
    ],
    "return_type" : "type-4",
@@ -2598,7 +2607,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     }
    ],
    "return_type" : "type-4",
@@ -2610,7 +2619,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     }
    ],
    "return_type" : "type-4",
@@ -2622,7 +2631,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     }
    ],
    "return_type" : "type-4",
@@ -2634,7 +2643,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     }
    ],
    "return_type" : "type-4",
@@ -2646,7 +2655,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     }
    ],
    "return_type" : "type-4",
@@ -2658,7 +2667,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     }
    ],
    "return_type" : "type-4",
@@ -2670,7 +2679,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     }
    ],
    "return_type" : "type-4",
@@ -2682,7 +2691,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     }
    ],
    "return_type" : "type-4",
@@ -2694,7 +2703,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     }
    ],
    "return_type" : "type-4",
@@ -2706,7 +2715,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     }
    ],
    "return_type" : "type-8",
@@ -2718,7 +2727,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     }
    ],
    "return_type" : "type-8",
@@ -2730,7 +2739,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     }
    ],
    "return_type" : "type-4",
@@ -2742,7 +2751,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     }
    ],
    "return_type" : "type-4",
@@ -2754,7 +2763,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     }
    ],
    "return_type" : "type-4",
@@ -2766,7 +2775,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     }
    ],
    "return_type" : "type-4",
@@ -2778,7 +2787,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     }
    ],
    "return_type" : "type-4",
@@ -2790,7 +2799,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     }
    ],
    "return_type" : "type-4",
@@ -2802,7 +2811,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     }
    ],
    "return_type" : "type-4",
@@ -2814,7 +2823,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     },
     {
      "referenced_type" : "type-4"
@@ -2835,7 +2844,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     }
    ],
    "return_type" : "type-4",
@@ -2847,7 +2856,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     }
    ],
    "return_type" : "type-4",
@@ -2859,7 +2868,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     }
    ],
    "return_type" : "type-16",
@@ -2871,7 +2880,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     },
     {
      "referenced_type" : "type-53"
@@ -2892,7 +2901,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     }
    ],
    "return_type" : "type-4",
@@ -2904,7 +2913,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     }
    ],
    "return_type" : "type-4",
@@ -2916,7 +2925,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     }
    ],
    "return_type" : "type-4",
@@ -2928,7 +2937,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     }
    ],
    "return_type" : "type-4",
@@ -2940,7 +2949,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     },
     {
      "referenced_type" : "type-4"
@@ -2955,13 +2964,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     },
     {
      "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-245"
     },
     {
      "referenced_type" : "type-8"
@@ -2976,10 +2985,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-210"
     },
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-89"
     },
     {
      "referenced_type" : "type-4"
@@ -3000,7 +3009,7 @@
      "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-330",
+   "return_type" : "type-207",
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
   {
@@ -3012,7 +3021,7 @@
      "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-330",
+   "return_type" : "type-207",
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
   {
@@ -3021,7 +3030,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-340"
+     "referenced_type" : "type-217"
     }
    ],
    "return_type" : "type-4",
@@ -3069,7 +3078,7 @@
      "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-245"
     }
    ],
    "return_type" : "type-4",
@@ -3090,7 +3099,7 @@
      "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-482",
+   "return_type" : "type-283",
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/AAudioUtilities.h"
   },
   {
@@ -3132,7 +3141,7 @@
      "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-483",
+   "return_type" : "type-284",
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/AAudioUtilities.h"
   },
   {
@@ -3162,7 +3171,7 @@
      "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-484",
+   "return_type" : "type-285",
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/AAudioUtilities.h"
   },
   {
@@ -3174,7 +3183,7 @@
      "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-485",
+   "return_type" : "type-286",
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/AAudioUtilities.h"
   },
   {
@@ -3186,7 +3195,7 @@
      "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-486",
+   "return_type" : "type-287",
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/AAudioUtilities.h"
   },
   {
@@ -3195,7 +3204,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-487"
+     "referenced_type" : "type-288"
     }
    ],
    "return_type" : "type-4",
@@ -3226,7 +3235,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-448"
+     "referenced_type" : "type-262"
     },
     {
      "referenced_type" : "type-27"
@@ -3242,7 +3251,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-448"
+     "referenced_type" : "type-262"
     },
     {
      "referenced_type" : "type-4"
@@ -3258,10 +3267,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-448"
+     "referenced_type" : "type-262"
     },
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-89"
     },
     {
      "referenced_type" : "type-53"
@@ -3280,16 +3289,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-448"
+     "referenced_type" : "type-262"
     },
     {
-     "referenced_type" : "type-488"
+     "referenced_type" : "type-289"
     },
     {
      "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-489"
+     "referenced_type" : "type-290"
     },
     {
      "referenced_type" : "type-4"
@@ -3305,7 +3314,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-279"
+     "referenced_type" : "type-142"
     },
     {
      "referenced_type" : "type-14"
@@ -3324,7 +3333,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-279"
+     "referenced_type" : "type-142"
     },
     {
      "referenced_type" : "type-14"
@@ -3343,7 +3352,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-279"
+     "referenced_type" : "type-142"
     },
     {
      "referenced_type" : "type-4"
@@ -3359,10 +3368,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-279"
+     "referenced_type" : "type-142"
     },
     {
-     "referenced_type" : "type-257"
+     "referenced_type" : "type-120"
     }
    ],
    "return_type" : "type-54",
@@ -3375,10 +3384,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-279"
+     "referenced_type" : "type-142"
     },
     {
-     "referenced_type" : "type-257"
+     "referenced_type" : "type-120"
     }
    ],
    "return_type" : "type-54",
@@ -3391,7 +3400,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-132"
     },
     {
      "referenced_type" : "type-14"
@@ -3410,7 +3419,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-132"
     },
     {
      "referenced_type" : "type-14"
@@ -3429,10 +3438,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-132"
     },
     {
-     "referenced_type" : "type-257"
+     "referenced_type" : "type-120"
     }
    ],
    "return_type" : "type-54",
@@ -3445,10 +3454,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-132"
     },
     {
-     "referenced_type" : "type-257"
+     "referenced_type" : "type-120"
     }
    ],
    "return_type" : "type-54",
@@ -3461,7 +3470,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-122"
     },
     {
      "referenced_type" : "type-4"
@@ -3477,7 +3486,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-122"
     }
    ],
    "return_type" : "type-4",
@@ -3490,7 +3499,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-122"
     }
    ],
    "return_type" : "type-54",
@@ -3503,7 +3512,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-122"
     }
    ],
    "return_type" : "type-54",
@@ -3516,7 +3525,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-122"
     }
    ],
    "return_type" : "type-54",
@@ -3529,10 +3538,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-116"
     },
     {
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-253"
     },
     {
      "referenced_type" : "type-8"
@@ -3548,7 +3557,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-116"
     }
    ],
    "return_type" : "type-4",
@@ -3561,7 +3570,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-116"
     }
    ],
    "return_type" : "type-4",
@@ -3574,7 +3583,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-269"
     }
    ],
    "return_type" : "type-54",
@@ -3587,7 +3596,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-269"
     }
    ],
    "return_type" : "type-54",
@@ -3600,7 +3609,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-269"
     }
    ],
    "return_type" : "type-54",
@@ -3613,10 +3622,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-269"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-116"
     }
    ],
    "return_type" : "type-54",
@@ -3629,10 +3638,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-269"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-116"
     }
    ],
    "return_type" : "type-54",
@@ -3645,7 +3654,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-269"
     }
    ],
    "return_type" : "type-54",
@@ -3658,7 +3667,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-269"
     }
    ],
    "return_type" : "type-54",
@@ -3671,7 +3680,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-269"
     }
    ],
    "return_type" : "type-54",
@@ -3684,7 +3693,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-116"
     },
     {
      "referenced_type" : "type-8"
@@ -3706,7 +3715,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-116"
     }
    ],
    "return_type" : "type-53",
@@ -3719,7 +3728,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-116"
     }
    ],
    "return_type" : "type-4",
@@ -3732,13 +3741,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-116"
     },
     {
      "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-245"
     },
     {
      "referenced_type" : "type-8"
@@ -3754,7 +3763,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-116"
     },
     {
      "referenced_type" : "type-27"
@@ -3770,7 +3779,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-116"
     },
     {
      "referenced_type" : "type-53"
@@ -3789,7 +3798,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-116"
     },
     {
      "referenced_type" : "type-4"
@@ -3805,7 +3814,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-116"
     }
    ],
    "return_type" : "type-4",
@@ -3818,10 +3827,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-116"
     },
     {
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-248"
     }
    ],
    "return_type" : "type-4",
@@ -3835,7 +3844,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-116"
     }
    ],
    "return_type" : "type-4",
@@ -3849,7 +3858,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-116"
     },
     {
      "referenced_type" : "type-4"
@@ -3865,7 +3874,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-116"
     }
    ],
    "return_type" : "type-4",
@@ -3878,7 +3887,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-116"
     }
    ],
    "return_type" : "type-4",
@@ -3891,7 +3900,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-116"
     }
    ],
    "return_type" : "type-54",
@@ -3904,7 +3913,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-116"
     }
    ],
    "return_type" : "type-54",
@@ -3917,7 +3926,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-116"
     }
    ],
    "return_type" : "type-54",
@@ -3930,7 +3939,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-116"
     }
    ],
    "return_type" : "type-54",
@@ -3943,10 +3952,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-436"
     },
     {
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-439"
     }
    ],
    "return_type" : "type-4",
@@ -3959,7 +3968,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-436"
     }
    ],
    "return_type" : "type-54",
@@ -3972,7 +3981,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-436"
     },
     {
      "referenced_type" : "type-4"
@@ -3988,7 +3997,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-436"
     },
     {
      "referenced_type" : "type-4"
@@ -4004,7 +4013,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-436"
     }
    ],
    "return_type" : "type-8",
@@ -4017,7 +4026,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-436"
     },
     {
      "referenced_type" : "type-8"
@@ -4033,7 +4042,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-436"
     }
    ],
    "return_type" : "type-8",
@@ -4046,7 +4055,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-436"
     },
     {
      "referenced_type" : "type-8"
@@ -4062,13 +4071,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-436"
     },
     {
      "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-245"
     }
    ],
    "return_type" : "type-4",
@@ -4081,10 +4090,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-436"
     },
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "type-254"
     }
    ],
    "return_type" : "type-4",
@@ -4097,7 +4106,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-436"
     }
    ],
    "return_type" : "type-4",
@@ -4110,10 +4119,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-436"
     },
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "type-254"
     }
    ],
    "return_type" : "type-4",
@@ -4126,7 +4135,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-436"
     }
    ],
    "return_type" : "type-4",
@@ -4139,10 +4148,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-436"
     },
     {
-     "referenced_type" : "type-459"
+     "referenced_type" : "type-438"
     },
     {
      "referenced_type" : "type-4"
@@ -4158,7 +4167,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-436"
     }
    ],
    "return_type" : "type-54",
@@ -4171,7 +4180,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-436"
     }
    ],
    "return_type" : "type-54",
@@ -4184,7 +4193,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-436"
     }
    ],
    "return_type" : "type-54",
@@ -4197,7 +4206,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-436"
     }
    ],
    "return_type" : "type-54",
@@ -4210,7 +4219,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-436"
     }
    ],
    "return_type" : "type-54",
@@ -4223,7 +4232,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-147"
     }
    ],
    "return_type" : "type-4",
@@ -4236,7 +4245,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-147"
     }
    ],
    "return_type" : "type-4",
@@ -4249,7 +4258,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-147"
     },
     {
      "referenced_type" : "type-4"
@@ -4271,7 +4280,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-147"
     }
    ],
    "return_type" : "type-4",
@@ -4284,7 +4293,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-147"
     }
    ],
    "return_type" : "type-4",
@@ -4297,7 +4306,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-147"
     }
    ],
    "return_type" : "type-4",
@@ -4310,7 +4319,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-147"
     }
    ],
    "return_type" : "type-8",
@@ -4323,7 +4332,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-147"
     },
     {
      "referenced_type" : "type-4"
@@ -4339,7 +4348,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-147"
     },
     {
      "referenced_type" : "type-4"
@@ -4358,7 +4367,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-147"
     }
    ],
    "return_type" : "type-4",
@@ -4371,10 +4380,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-248"
     }
    ],
    "return_type" : "type-4",
@@ -4387,7 +4396,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-147"
     }
    ],
    "return_type" : "type-4",
@@ -4400,10 +4409,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-89"
     },
     {
      "referenced_type" : "type-4"
@@ -4422,7 +4431,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-147"
     }
    ],
    "return_type" : "type-54",
@@ -4435,7 +4444,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-147"
     }
    ],
    "return_type" : "type-54",
@@ -4448,7 +4457,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-147"
     }
    ],
    "return_type" : "type-54",
@@ -4461,7 +4470,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-147"
     }
    ],
    "return_type" : "type-54",
@@ -4474,7 +4483,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-147"
     }
    ],
    "return_type" : "type-54",
@@ -4488,7 +4497,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
@@ -4506,7 +4515,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-4"
@@ -4518,7 +4527,7 @@
      "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-352"
+     "referenced_type" : "type-229"
     }
    ],
    "return_type" : "type-4",
@@ -4531,10 +4540,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-350",
+   "return_type" : "type-227",
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
   {
@@ -4545,7 +4554,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-4"
@@ -4561,7 +4570,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-14"
@@ -4580,7 +4589,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-4"
@@ -4599,7 +4608,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-14"
@@ -4619,7 +4628,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-16"
@@ -4635,7 +4644,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-126"
     }
    ],
    "return_type" : "type-54",
@@ -4648,7 +4657,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-126"
     }
    ],
    "return_type" : "type-54",
@@ -4661,7 +4670,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-126"
     }
    ],
    "return_type" : "type-54",
@@ -4674,7 +4683,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-126"
     }
    ],
    "return_type" : "type-54",
@@ -4687,7 +4696,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-140"
     }
    ],
    "return_type" : "type-4",
@@ -4700,7 +4709,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-140"
     },
     {
      "referenced_type" : "type-4"
@@ -4722,7 +4731,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-140"
     }
    ],
    "return_type" : "type-4",
@@ -4735,7 +4744,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-140"
     },
     {
      "referenced_type" : "type-4"
@@ -4751,7 +4760,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-140"
     },
     {
      "referenced_type" : "type-4"
@@ -4770,7 +4779,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-140"
     }
    ],
    "return_type" : "type-8",
@@ -4783,7 +4792,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-140"
     }
    ],
    "return_type" : "type-4",
@@ -4796,16 +4805,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-140"
     },
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-89"
     },
     {
      "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-233",
+   "return_type" : "type-89",
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamRecord.h"
   },
   {
@@ -4815,10 +4824,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-140"
     },
     {
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-248"
     }
    ],
    "return_type" : "type-4",
@@ -4831,7 +4840,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-140"
     },
     {
      "referenced_type" : "type-53"
@@ -4853,7 +4862,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-140"
     }
    ],
    "return_type" : "type-4",
@@ -4866,7 +4875,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-140"
     }
    ],
    "return_type" : "type-54",
@@ -4879,7 +4888,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-140"
     }
    ],
    "return_type" : "type-54",
@@ -4892,7 +4901,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-140"
     }
    ],
    "return_type" : "type-54",
@@ -4905,7 +4914,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-140"
     }
    ],
    "return_type" : "type-54",
@@ -4918,7 +4927,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-140"
     }
    ],
    "return_type" : "type-54",
@@ -4931,13 +4940,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-300"
+     "referenced_type" : "type-177"
     },
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-500"
     },
     {
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-159"
     }
    ],
    "return_type" : "type-4",
@@ -4950,7 +4959,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-300"
+     "referenced_type" : "type-177"
     },
     {
      "referenced_type" : "type-4"
@@ -4966,7 +4975,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-300"
+     "referenced_type" : "type-177"
     },
     {
      "referenced_type" : "type-4"
@@ -4982,7 +4991,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-300"
+     "referenced_type" : "type-177"
     },
     {
      "referenced_type" : "type-4"
@@ -4998,7 +5007,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-300"
+     "referenced_type" : "type-177"
     },
     {
      "referenced_type" : "type-4"
@@ -5014,7 +5023,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-300"
+     "referenced_type" : "type-177"
     },
     {
      "referenced_type" : "type-4"
@@ -5030,10 +5039,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-300"
+     "referenced_type" : "type-177"
     }
    ],
-   "return_type" : "type-96",
+   "return_type" : "type-495",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
@@ -5043,7 +5052,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-300"
+     "referenced_type" : "type-177"
     }
    ],
    "return_type" : "type-54",
@@ -5056,7 +5065,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-300"
+     "referenced_type" : "type-177"
     },
     {
      "referenced_type" : "type-4"
@@ -5078,13 +5087,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-300"
+     "referenced_type" : "type-177"
     },
     {
      "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-501"
     }
    ],
    "return_type" : "type-4",
@@ -5097,7 +5106,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-300"
+     "referenced_type" : "type-177"
     },
     {
      "referenced_type" : "type-4"
@@ -5116,7 +5125,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-300"
+     "referenced_type" : "type-177"
     }
    ],
    "return_type" : "type-54",
@@ -5129,7 +5138,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-300"
+     "referenced_type" : "type-177"
     }
    ],
    "return_type" : "type-54",
@@ -5142,7 +5151,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-300"
+     "referenced_type" : "type-177"
     }
    ],
    "return_type" : "type-54",
@@ -5155,7 +5164,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-300"
+     "referenced_type" : "type-177"
     }
    ],
    "return_type" : "type-54",
@@ -5168,7 +5177,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-300"
+     "referenced_type" : "type-177"
     }
    ],
    "return_type" : "type-54",
@@ -5181,10 +5190,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-271"
     },
     {
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-115"
     }
    ],
    "return_type" : "type-4",
@@ -5197,7 +5206,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-271"
     }
    ],
    "return_type" : "type-54",
@@ -5210,7 +5219,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-271"
     }
    ],
    "return_type" : "type-54",
@@ -5223,7 +5232,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-271"
     }
    ],
    "return_type" : "type-54",
@@ -5236,7 +5245,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-271"
     }
    ],
    "return_type" : "type-54",
@@ -5249,7 +5258,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-271"
     }
    ],
    "return_type" : "type-54",
@@ -5262,10 +5271,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-156"
     },
     {
-     "referenced_type" : "type-118"
+     "referenced_type" : "type-513"
     }
    ],
    "return_type" : "type-4",
@@ -5278,7 +5287,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-156"
     }
    ],
    "return_type" : "type-54",
@@ -5291,7 +5300,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-156"
     }
    ],
    "return_type" : "type-54",
@@ -5304,7 +5313,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-156"
     }
    ],
    "return_type" : "type-54",
@@ -5317,7 +5326,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-156"
     }
    ],
    "return_type" : "type-54",
@@ -5330,7 +5339,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-156"
     }
    ],
    "return_type" : "type-54",
@@ -5343,10 +5352,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-66"
     },
     {
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-253"
     }
    ],
    "return_type" : "type-4",
@@ -5359,7 +5368,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-66"
     },
     {
      "referenced_type" : "type-4"
@@ -5376,7 +5385,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-66"
     },
     {
      "referenced_type" : "type-53"
@@ -5398,7 +5407,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-66"
     }
    ],
    "return_type" : "type-4",
@@ -5411,13 +5420,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-66"
     },
     {
-     "referenced_type" : "type-463"
+     "referenced_type" : "type-444"
     },
     {
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-245"
     }
    ],
    "return_type" : "type-4",
@@ -5430,7 +5439,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-66"
     },
     {
      "referenced_type" : "type-4"
@@ -5453,10 +5462,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-66"
     },
     {
-     "referenced_type" : "type-464"
+     "referenced_type" : "type-445"
     }
    ],
    "return_type" : "type-54",
@@ -5469,7 +5478,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-66"
     }
    ],
    "return_type" : "type-4",
@@ -5483,7 +5492,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-66"
     }
    ],
    "return_type" : "type-4",
@@ -5496,7 +5505,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-66"
     },
     {
      "referenced_type" : "type-4"
@@ -5512,7 +5521,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-66"
     }
    ],
    "return_type" : "type-4",
@@ -5526,7 +5535,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-66"
     }
    ],
    "return_type" : "type-4",
@@ -5540,10 +5549,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-66"
     },
     {
-     "referenced_type" : "type-465"
+     "referenced_type" : "type-446"
     },
     {
      "referenced_type" : "type-8"
@@ -5559,7 +5568,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-66"
     }
    ],
    "return_type" : "type-4",
@@ -5573,10 +5582,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-66"
     },
     {
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-439"
     }
    ],
    "return_type" : "type-4",
@@ -5590,10 +5599,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-66"
     },
     {
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-439"
     }
    ],
    "return_type" : "type-4",
@@ -5606,7 +5615,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-66"
     }
    ],
    "return_type" : "type-4",
@@ -5620,10 +5629,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-66"
     },
     {
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-439"
     }
    ],
    "return_type" : "type-4",
@@ -5637,7 +5646,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-66"
     },
     {
      "referenced_type" : "type-4"
@@ -5653,7 +5662,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-66"
     }
    ],
    "return_type" : "type-8",
@@ -5667,7 +5676,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-66"
     }
    ],
    "return_type" : "type-4",
@@ -5680,10 +5689,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-66"
     },
     {
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-248"
     }
    ],
    "return_type" : "type-4",
@@ -5696,7 +5705,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-66"
     }
    ],
    "return_type" : "type-4",
@@ -5709,7 +5718,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-66"
     },
     {
      "referenced_type" : "type-18"
@@ -5728,7 +5737,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-66"
     }
    ],
    "return_type" : "type-54",
@@ -5741,7 +5750,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-66"
     }
    ],
    "return_type" : "type-54",
@@ -5754,7 +5763,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-66"
     }
    ],
    "return_type" : "type-54",
@@ -5767,7 +5776,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-570"
     },
     {
      "referenced_type" : "type-4"
@@ -5789,7 +5798,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-570"
     },
     {
      "referenced_type" : "type-4"
@@ -5820,10 +5829,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-570"
     },
     {
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-577"
     }
    ],
    "return_type" : "type-4",
@@ -5836,7 +5845,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-570"
     }
    ],
    "return_type" : "type-4",
@@ -5849,7 +5858,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-570"
     },
     {
      "referenced_type" : "type-4"
@@ -5865,7 +5874,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-570"
     }
    ],
    "return_type" : "type-4",
@@ -5878,7 +5887,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-570"
     },
     {
      "referenced_type" : "type-4"
@@ -5894,7 +5903,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-570"
     }
    ],
    "return_type" : "type-4",
@@ -5907,7 +5916,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-570"
     },
     {
      "referenced_type" : "type-4"
@@ -5923,7 +5932,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-570"
     }
    ],
    "return_type" : "type-54",
@@ -5936,13 +5945,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-570"
     },
     {
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-578"
     },
     {
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-579"
     }
    ],
    "return_type" : "type-4",
@@ -5955,7 +5964,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-570"
     }
    ],
    "return_type" : "type-54",
@@ -5968,7 +5977,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-570"
     }
    ],
    "return_type" : "type-54",
@@ -5981,7 +5990,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-570"
     }
    ],
    "return_type" : "type-54",
@@ -5994,7 +6003,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-570"
     }
    ],
    "return_type" : "type-54",
@@ -6007,7 +6016,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-570"
     }
    ],
    "return_type" : "type-54",
@@ -6020,7 +6029,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-479"
     },
     {
      "referenced_type" : "type-4"
@@ -6036,7 +6045,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-479"
     },
     {
      "referenced_type" : "type-8"
@@ -6055,7 +6064,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-479"
     },
     {
      "referenced_type" : "type-4"
@@ -6071,7 +6080,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-479"
     },
     {
      "referenced_type" : "type-8"
@@ -6090,7 +6099,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-479"
     },
     {
      "referenced_type" : "type-8"
@@ -6106,7 +6115,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-479"
     },
     {
      "referenced_type" : "type-8"
@@ -6123,7 +6132,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-479"
     }
    ],
    "return_type" : "type-54",
@@ -6136,7 +6145,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-479"
     }
    ],
    "return_type" : "type-54",
@@ -6149,7 +6158,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-479"
     }
    ],
    "return_type" : "type-54",
@@ -6162,7 +6171,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-479"
     }
    ],
    "return_type" : "type-54",
@@ -6175,7 +6184,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-479"
     }
    ],
    "return_type" : "type-54",
@@ -6188,7 +6197,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-479"
     }
    ],
    "return_type" : "type-54",
@@ -6201,10 +6210,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-68"
     },
     {
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-220"
     }
    ],
    "return_type" : "type-54",
@@ -6217,7 +6226,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-68"
     }
    ],
    "return_type" : "type-54",
@@ -6230,7 +6239,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-68"
     }
    ],
    "return_type" : "type-54",
@@ -6243,7 +6252,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-68"
     }
    ],
    "return_type" : "type-54",
@@ -6256,7 +6265,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-68"
     }
    ],
    "return_type" : "type-54",
@@ -6269,7 +6278,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-68"
     }
    ],
    "return_type" : "type-54",
@@ -6282,7 +6291,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-578"
     }
    ],
    "return_type" : "type-4",
@@ -6295,10 +6304,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-578"
     },
     {
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-589"
     }
    ],
    "return_type" : "type-4",
@@ -6312,10 +6321,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-578"
     },
     {
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-582"
     }
    ],
    "return_type" : "type-4",
@@ -6328,7 +6337,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-578"
     }
    ],
    "return_type" : "type-54",
@@ -6341,7 +6350,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-578"
     }
    ],
    "return_type" : "type-4",
@@ -6354,10 +6363,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-578"
     },
     {
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-582"
     },
     {
      "referenced_type" : "type-4"
@@ -6373,7 +6382,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-578"
     },
     {
      "referenced_type" : "type-4"
@@ -6382,7 +6391,7 @@
      "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-253"
     }
    ],
    "return_type" : "type-4",
@@ -6395,7 +6404,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-578"
     }
    ],
    "return_type" : "type-54",
@@ -6408,7 +6417,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-578"
     }
    ],
    "return_type" : "type-54",
@@ -6421,7 +6430,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-578"
     }
    ],
    "return_type" : "type-54",
@@ -6434,7 +6443,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-578"
     }
    ],
    "return_type" : "type-54",
@@ -6447,7 +6456,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-578"
     }
    ],
    "return_type" : "type-54",
@@ -6460,10 +6469,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-216"
+     "referenced_type" : "type-590"
     },
     {
-     "referenced_type" : "type-224"
+     "referenced_type" : "type-597"
     }
    ],
    "return_type" : "type-4",
@@ -6476,7 +6485,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-216"
+     "referenced_type" : "type-590"
     }
    ],
    "return_type" : "type-54",
@@ -6489,7 +6498,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-216"
+     "referenced_type" : "type-590"
     },
     {
      "referenced_type" : "type-4"
@@ -6511,13 +6520,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-216"
+     "referenced_type" : "type-590"
     },
     {
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-578"
     },
     {
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-253"
     }
    ],
    "return_type" : "type-4",
@@ -6530,7 +6539,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-216"
+     "referenced_type" : "type-590"
     }
    ],
    "return_type" : "type-54",
@@ -6543,7 +6552,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-216"
+     "referenced_type" : "type-590"
     }
    ],
    "return_type" : "type-54",
@@ -6556,7 +6565,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-216"
+     "referenced_type" : "type-590"
     }
    ],
    "return_type" : "type-54",
@@ -6569,7 +6578,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-216"
+     "referenced_type" : "type-590"
     }
    ],
    "return_type" : "type-54",
@@ -6582,7 +6591,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-216"
+     "referenced_type" : "type-590"
     }
    ],
    "return_type" : "type-54",
@@ -6595,10 +6604,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-81"
+     "referenced_type" : "type-481"
     },
     {
-     "referenced_type" : "type-91"
+     "referenced_type" : "type-491"
     }
    ],
    "return_type" : "type-4",
@@ -6611,10 +6620,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-81"
+     "referenced_type" : "type-481"
     },
     {
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-484"
     },
     {
      "referenced_type" : "type-4"
@@ -6630,7 +6639,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-81"
+     "referenced_type" : "type-481"
     }
    ],
    "return_type" : "type-54",
@@ -6643,7 +6652,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-81"
+     "referenced_type" : "type-481"
     }
    ],
    "return_type" : "type-4",
@@ -6656,10 +6665,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-81"
+     "referenced_type" : "type-481"
     },
     {
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-492"
     }
    ],
    "return_type" : "type-4",
@@ -6672,7 +6681,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-81"
+     "referenced_type" : "type-481"
     }
    ],
    "return_type" : "type-54",
@@ -6685,7 +6694,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-81"
+     "referenced_type" : "type-481"
     }
    ],
    "return_type" : "type-54",
@@ -6698,7 +6707,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-81"
+     "referenced_type" : "type-481"
     }
    ],
    "return_type" : "type-54",
@@ -6711,7 +6720,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-81"
+     "referenced_type" : "type-481"
     }
    ],
    "return_type" : "type-54",
@@ -6724,7 +6733,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-81"
+     "referenced_type" : "type-481"
     }
    ],
    "return_type" : "type-54",
@@ -6738,7 +6747,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-471"
     }
    ],
    "return_type" : "type-4",
@@ -6751,7 +6760,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-471"
     }
    ],
    "return_type" : "type-53",
@@ -6764,7 +6773,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-471"
     }
    ],
    "return_type" : "type-4",
@@ -6777,7 +6786,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-471"
     }
    ],
    "return_type" : "type-4",
@@ -6790,7 +6799,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-471"
     }
    ],
    "return_type" : "type-8",
@@ -6804,7 +6813,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-471"
     },
     {
      "referenced_type" : "type-53"
@@ -6829,7 +6838,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-471"
     }
    ],
    "return_type" : "type-8",
@@ -6843,7 +6852,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-471"
     }
    ],
    "return_type" : "type-54",
@@ -6857,10 +6866,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-471"
     },
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-89"
     },
     {
      "referenced_type" : "type-4"
@@ -6877,7 +6886,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-471"
     }
    ],
    "return_type" : "type-54",
@@ -6890,10 +6899,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-471"
     },
     {
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-474"
     }
    ],
    "return_type" : "type-4",
@@ -6906,10 +6915,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-471"
     },
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-89"
     },
     {
      "referenced_type" : "type-4"
@@ -6928,7 +6937,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-471"
     },
     {
      "referenced_type" : "type-18"
@@ -6948,7 +6957,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-471"
     },
     {
      "referenced_type" : "type-18"
@@ -6968,7 +6977,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-471"
     }
    ],
    "return_type" : "type-54",
@@ -6981,7 +6990,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-471"
     }
    ],
    "return_type" : "type-54",
@@ -6994,7 +7003,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-471"
     }
    ],
    "return_type" : "type-54",
@@ -7007,10 +7016,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-514"
     },
     {
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-522"
     }
    ],
    "return_type" : "type-4",
@@ -7023,7 +7032,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-514"
     }
    ],
    "return_type" : "type-54",
@@ -7036,7 +7045,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-514"
     }
    ],
    "return_type" : "type-54",
@@ -7049,7 +7058,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-514"
     }
    ],
    "return_type" : "type-54",
@@ -7062,7 +7071,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-514"
     }
    ],
    "return_type" : "type-54",
@@ -7075,7 +7084,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-514"
     }
    ],
    "return_type" : "type-54",
@@ -7088,7 +7097,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-459"
     }
    ],
    "return_type" : "type-53",
@@ -7101,7 +7110,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-459"
     }
    ],
    "return_type" : "type-8",
@@ -7115,7 +7124,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-459"
     },
     {
      "referenced_type" : "type-53"
@@ -7140,7 +7149,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-459"
     }
    ],
    "return_type" : "type-8",
@@ -7154,7 +7163,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-459"
     },
     {
      "referenced_type" : "type-53"
@@ -7174,7 +7183,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-459"
     }
    ],
    "return_type" : "type-54",
@@ -7187,7 +7196,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-459"
     },
     {
      "referenced_type" : "type-53"
@@ -7209,7 +7218,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-459"
     },
     {
      "referenced_type" : "type-18"
@@ -7229,7 +7238,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-459"
     },
     {
      "referenced_type" : "type-18"
@@ -7249,7 +7258,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-459"
     }
    ],
    "return_type" : "type-54",
@@ -7262,7 +7271,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-459"
     }
    ],
    "return_type" : "type-54",
@@ -7275,7 +7284,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-459"
     }
    ],
    "return_type" : "type-54",
@@ -7334,7 +7343,7 @@
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "type-254"
     },
     {
      "referenced_type" : "type-4"
@@ -7372,7 +7381,7 @@
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "type-254"
     }
    ],
    "return_type" : "type-4",
@@ -7388,7 +7397,7 @@
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "type-254"
     }
    ],
    "return_type" : "type-4",
@@ -7436,7 +7445,7 @@
      "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-89"
     },
     {
      "referenced_type" : "type-4"
@@ -7571,16 +7580,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-527"
     }
    ],
-   "return_type" : "type-495",
+   "return_type" : "type-599",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
   {
    "function_name" : "android::IAAudioClient::getDefaultImpl",
    "linker_set_key" : "_ZN7android13IAAudioClient14getDefaultImplEv",
-   "return_type" : "type-142",
+   "return_type" : "type-532",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
   {
@@ -7589,7 +7598,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-496"
+     "referenced_type" : "type-600"
     }
    ],
    "return_type" : "type-16",
@@ -7602,7 +7611,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-531"
     }
    ],
    "return_type" : "type-54",
@@ -7615,7 +7624,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-531"
     }
    ],
    "return_type" : "type-54",
@@ -7628,7 +7637,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-531"
     }
    ],
    "return_type" : "type-54",
@@ -7641,7 +7650,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-531"
     }
    ],
    "return_type" : "type-54",
@@ -7654,16 +7663,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-537"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-150"
+     "referenced_type" : "type-540"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-541"
     },
     {
      "default_arg" : true,
@@ -7679,16 +7688,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-556"
     }
    ],
-   "return_type" : "type-497",
+   "return_type" : "type-601",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
   {
    "function_name" : "android::IAAudioService::getDefaultImpl",
    "linker_set_key" : "_ZN7android14IAAudioService14getDefaultImplEv",
-   "return_type" : "type-180",
+   "return_type" : "type-561",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
   {
@@ -7697,7 +7706,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-498"
+     "referenced_type" : "type-602"
     }
    ],
    "return_type" : "type-16",
@@ -7710,7 +7719,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-179"
+     "referenced_type" : "type-560"
     }
    ],
    "return_type" : "type-54",
@@ -7723,7 +7732,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-179"
+     "referenced_type" : "type-560"
     }
    ],
    "return_type" : "type-54",
@@ -7736,7 +7745,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-179"
+     "referenced_type" : "type-560"
     }
    ],
    "return_type" : "type-54",
@@ -7749,7 +7758,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-179"
+     "referenced_type" : "type-560"
     }
    ],
    "return_type" : "type-54",
@@ -7762,16 +7771,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-564"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-567"
     },
     {
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-568"
     },
     {
      "default_arg" : true,
@@ -7788,7 +7797,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-445"
+     "referenced_type" : "type-259"
     }
    ],
    "return_type" : "type-4",
@@ -7801,7 +7810,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-445"
+     "referenced_type" : "type-259"
     },
     {
      "referenced_type" : "type-4"
@@ -7817,7 +7826,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-445"
+     "referenced_type" : "type-259"
     }
    ],
    "return_type" : "type-4",
@@ -7830,7 +7839,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-445"
+     "referenced_type" : "type-259"
     },
     {
      "referenced_type" : "type-4"
@@ -7846,7 +7855,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-445"
+     "referenced_type" : "type-259"
     },
     {
      "referenced_type" : "type-4"
@@ -7862,7 +7871,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-445"
+     "referenced_type" : "type-259"
     }
    ],
    "return_type" : "type-4",
@@ -7875,7 +7884,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-445"
+     "referenced_type" : "type-259"
     }
    ],
    "return_type" : "type-4",
@@ -7888,7 +7897,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-445"
+     "referenced_type" : "type-259"
     },
     {
      "referenced_type" : "type-4"
@@ -7907,7 +7916,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-445"
+     "referenced_type" : "type-259"
     }
    ],
    "return_type" : "type-54",
@@ -7920,7 +7929,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-445"
+     "referenced_type" : "type-259"
     }
    ],
    "return_type" : "type-54",
@@ -7933,7 +7942,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-445"
+     "referenced_type" : "type-259"
     }
    ],
    "return_type" : "type-54",
@@ -7946,7 +7955,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-102"
     },
     {
      "referenced_type" : "type-4"
@@ -7963,7 +7972,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-102"
     }
    ],
    "return_type" : "type-27",
@@ -7976,7 +7985,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-102"
     },
     {
      "referenced_type" : "type-8"
@@ -7995,7 +8004,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-102"
     },
     {
      "referenced_type" : "type-27"
@@ -8011,7 +8020,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-102"
     },
     {
      "referenced_type" : "type-4"
@@ -8027,7 +8036,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-102"
     },
     {
      "referenced_type" : "type-4"
@@ -8043,7 +8052,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-8"
@@ -8062,7 +8071,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-4"
@@ -8078,7 +8087,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-96"
     },
     {
      "referenced_type" : "type-4"
@@ -8094,7 +8103,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1175"
+     "referenced_type" : "type-1268"
     },
     {
      "referenced_type" : "type-8"
@@ -8113,7 +8122,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1175"
+     "referenced_type" : "type-1268"
     },
     {
      "referenced_type" : "type-4"
@@ -8129,7 +8138,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1175"
+     "referenced_type" : "type-1268"
     },
     {
      "referenced_type" : "type-4"
@@ -8145,7 +8154,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-166"
+     "referenced_type" : "type-72"
     },
     {
      "referenced_type" : "type-8"
@@ -8164,10 +8173,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-83"
     },
     {
-     "referenced_type" : "type-178"
+     "referenced_type" : "type-74"
     },
     {
      "referenced_type" : "type-4"
@@ -8187,10 +8196,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-83"
     },
     {
-     "referenced_type" : "type-178"
+     "referenced_type" : "type-74"
     },
     {
      "referenced_type" : "type-4"
@@ -8210,7 +8219,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-83"
     }
    ],
    "return_type" : "type-54",
@@ -8223,7 +8232,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-83"
     }
    ],
    "return_type" : "type-54",
@@ -8236,7 +8245,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-83"
     }
    ],
    "return_type" : "type-54",
@@ -8249,10 +8258,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-231"
+     "referenced_type" : "type-87"
     }
    ],
-   "return_type" : "type-215",
+   "return_type" : "type-79",
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/AudioProcessorBase.h"
   },
   {
@@ -8262,7 +8271,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-231"
+     "referenced_type" : "type-87"
     },
     {
      "referenced_type" : "type-8"
@@ -8281,10 +8290,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-85"
     },
     {
-     "referenced_type" : "type-231"
+     "referenced_type" : "type-87"
     }
    ],
    "return_type" : "type-54",
@@ -8297,10 +8306,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-85"
     },
     {
-     "referenced_type" : "type-231"
+     "referenced_type" : "type-87"
     }
    ],
    "return_type" : "type-54",
@@ -8313,7 +8322,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-85"
     },
     {
      "referenced_type" : "type-8"
@@ -8332,7 +8341,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-867"
+     "referenced_type" : "type-816"
     },
     {
      "referenced_type" : "type-8"
@@ -8351,7 +8360,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-867"
+     "referenced_type" : "type-816"
     },
     {
      "referenced_type" : "type-4"
@@ -8367,7 +8376,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-867"
+     "referenced_type" : "type-816"
     },
     {
      "referenced_type" : "type-4"
@@ -8383,7 +8392,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-867"
+     "referenced_type" : "type-816"
     }
    ],
    "return_type" : "type-54",
@@ -8396,7 +8405,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-867"
+     "referenced_type" : "type-816"
     }
    ],
    "return_type" : "type-54",
@@ -8409,7 +8418,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-867"
+     "referenced_type" : "type-816"
     }
    ],
    "return_type" : "type-54",
@@ -8422,7 +8431,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-819"
     },
     {
      "referenced_type" : "type-53"
@@ -8441,7 +8450,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-819"
     },
     {
      "referenced_type" : "type-4"
@@ -8457,7 +8466,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-819"
     },
     {
      "referenced_type" : "type-4"
@@ -8473,7 +8482,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-872"
+     "referenced_type" : "type-821"
     },
     {
      "referenced_type" : "type-53"
@@ -8492,7 +8501,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-872"
+     "referenced_type" : "type-821"
     },
     {
      "referenced_type" : "type-4"
@@ -8508,7 +8517,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-872"
+     "referenced_type" : "type-821"
     },
     {
      "referenced_type" : "type-4"
@@ -8525,7 +8534,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-237"
+     "referenced_type" : "type-93"
     },
     {
      "referenced_type" : "type-4"
@@ -8541,7 +8550,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-869"
+     "referenced_type" : "type-818"
     },
     {
      "referenced_type" : "type-53"
@@ -8560,7 +8569,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-869"
+     "referenced_type" : "type-818"
     },
     {
      "referenced_type" : "type-4"
@@ -8576,7 +8585,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-869"
+     "referenced_type" : "type-818"
     },
     {
      "referenced_type" : "type-4"
@@ -8592,7 +8601,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1176"
+     "referenced_type" : "type-1271"
     },
     {
      "referenced_type" : "type-8"
@@ -8611,7 +8620,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1176"
+     "referenced_type" : "type-1271"
     },
     {
      "referenced_type" : "type-4"
@@ -8627,7 +8636,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1176"
+     "referenced_type" : "type-1271"
     },
     {
      "referenced_type" : "type-4"
@@ -8643,7 +8652,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1177"
+     "referenced_type" : "type-1272"
     },
     {
      "referenced_type" : "type-8"
@@ -8662,7 +8671,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1177"
+     "referenced_type" : "type-1272"
     },
     {
      "referenced_type" : "type-4"
@@ -8678,7 +8687,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1177"
+     "referenced_type" : "type-1272"
     },
     {
      "referenced_type" : "type-4"
@@ -8694,7 +8703,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-244"
     }
    ],
    "return_type" : "type-16",
@@ -8707,7 +8716,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-433"
+     "referenced_type" : "type-278"
     }
    ],
    "return_type" : "type-4",
@@ -8720,7 +8729,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-433"
+     "referenced_type" : "type-278"
     }
    ],
    "return_type" : "type-4",
@@ -8733,7 +8742,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-433"
+     "referenced_type" : "type-278"
     }
    ],
    "return_type" : "type-54",
@@ -8746,7 +8755,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-283"
+     "referenced_type" : "type-146"
     }
    ],
    "return_type" : "type-4",
@@ -8759,7 +8768,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-283"
+     "referenced_type" : "type-146"
     }
    ],
    "return_type" : "type-4",
@@ -8772,7 +8781,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-283"
+     "referenced_type" : "type-146"
     }
    ],
    "return_type" : "type-4",
@@ -8785,7 +8794,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-283"
+     "referenced_type" : "type-146"
     }
    ],
    "return_type" : "type-4",
@@ -8798,7 +8807,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-139"
     }
    ],
    "return_type" : "type-4",
@@ -8811,7 +8820,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-139"
     }
    ],
    "return_type" : "type-4",
@@ -8824,7 +8833,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-139"
     }
    ],
    "return_type" : "type-4",
@@ -8837,7 +8846,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-139"
     }
    ],
    "return_type" : "type-4",
@@ -8850,7 +8859,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-386"
+     "referenced_type" : "type-270"
     }
    ],
    "return_type" : "type-54",
@@ -8863,7 +8872,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-386"
+     "referenced_type" : "type-270"
     }
    ],
    "return_type" : "type-4",
@@ -8876,10 +8885,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-287"
+     "referenced_type" : "type-155"
     },
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-509"
     }
    ],
    "return_type" : "type-4",
@@ -8892,7 +8901,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-287"
+     "referenced_type" : "type-155"
     }
    ],
    "return_type" : "type-54",
@@ -8905,7 +8914,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-287"
+     "referenced_type" : "type-155"
     }
    ],
    "return_type" : "type-4",
@@ -8918,7 +8927,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-65"
     }
    ],
    "return_type" : "type-4",
@@ -8931,7 +8940,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-65"
     }
    ],
    "return_type" : "type-4",
@@ -8944,7 +8953,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-65"
     }
    ],
    "return_type" : "type-4",
@@ -8958,7 +8967,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-65"
     }
    ],
    "return_type" : "type-16",
@@ -8971,10 +8980,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-572"
     },
     {
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-573"
     }
    ],
    "return_type" : "type-4",
@@ -8988,7 +8997,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-572"
     }
    ],
    "return_type" : "type-4",
@@ -9001,7 +9010,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-315"
+     "referenced_type" : "type-192"
     }
    ],
    "return_type" : "type-16",
@@ -9014,7 +9023,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-315"
+     "referenced_type" : "type-192"
     },
     {
      "referenced_type" : "type-8"
@@ -9030,7 +9039,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-315"
+     "referenced_type" : "type-192"
     },
     {
      "referenced_type" : "type-8"
@@ -9040,13 +9049,27 @@
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
   },
   {
+   "access" : "private",
+   "function_name" : "aaudio::IsochronousClockModel::getLateTimeOffsetNanos",
+   "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel22getLateTimeOffsetNanosEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-192"
+    }
+   ],
+   "return_type" : "type-4",
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
+  },
+  {
    "function_name" : "aaudio::IsochronousClockModel::convertDeltaPositionToTime",
    "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel26convertDeltaPositionToTimeEl",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-315"
+     "referenced_type" : "type-192"
     },
     {
      "referenced_type" : "type-8"
@@ -9062,7 +9085,39 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-315"
+     "referenced_type" : "type-192"
+    },
+    {
+     "referenced_type" : "type-8"
+    }
+   ],
+   "return_type" : "type-8",
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
+  },
+  {
+   "function_name" : "aaudio::IsochronousClockModel::convertLatestTimeToPosition",
+   "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel27convertLatestTimeToPositionEl",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-192"
+    },
+    {
+     "referenced_type" : "type-8"
+    }
+   ],
+   "return_type" : "type-8",
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
+  },
+  {
+   "function_name" : "aaudio::IsochronousClockModel::convertPositionToLatestTime",
+   "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel27convertPositionToLatestTimeEl",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-192"
     },
     {
      "referenced_type" : "type-8"
@@ -9078,7 +9133,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-315"
+     "referenced_type" : "type-192"
     }
    ],
    "return_type" : "type-54",
@@ -9091,7 +9146,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-315"
+     "referenced_type" : "type-192"
     }
    ],
    "return_type" : "type-16",
@@ -9104,7 +9159,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-93"
+     "referenced_type" : "type-63"
     }
    ],
    "return_type" : "type-54",
@@ -9117,7 +9172,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-93"
+     "referenced_type" : "type-63"
     }
    ],
    "return_type" : "type-4",
@@ -9130,10 +9185,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-585"
     }
    ],
    "return_type" : "type-4",
@@ -9147,7 +9202,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-584"
     }
    ],
    "return_type" : "type-4",
@@ -9160,10 +9215,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-592"
     },
     {
-     "referenced_type" : "type-219"
+     "referenced_type" : "type-593"
     }
    ],
    "return_type" : "type-4",
@@ -9177,7 +9232,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-592"
     }
    ],
    "return_type" : "type-4",
@@ -9190,10 +9245,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-486"
     },
     {
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-487"
     }
    ],
    "return_type" : "type-4",
@@ -9207,7 +9262,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-486"
     }
    ],
    "return_type" : "type-4",
@@ -9220,10 +9275,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-121"
+     "referenced_type" : "type-515"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-516"
     }
    ],
    "return_type" : "type-4",
@@ -9236,10 +9291,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
-   "return_type" : "type-135",
+   "return_type" : "type-528",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
   {
@@ -9249,10 +9304,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-176"
+     "referenced_type" : "type-559"
     }
    ],
-   "return_type" : "type-172",
+   "return_type" : "type-557",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
   {
@@ -9262,7 +9317,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-14"
@@ -9281,10 +9336,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-514"
     },
     {
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-522"
     }
    ],
    "return_type" : "type-4",
@@ -9297,10 +9352,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-121"
+     "referenced_type" : "type-515"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-516"
     }
    ],
    "return_type" : "type-4",
@@ -9313,16 +9368,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-537"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-150"
+     "referenced_type" : "type-540"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-541"
     },
     {
      "default_arg" : true,
@@ -9339,16 +9394,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-564"
     },
     {
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-567"
     },
     {
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-568"
     },
     {
      "default_arg" : true,
@@ -9364,27 +9419,27 @@
   {
    "linker_set_key" : "_ZN7android13IAAudioClient10descriptorE",
    "name" : "android::IAAudioClient::descriptor",
-   "referenced_type" : "type-291",
+   "referenced_type" : "type-162",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android13IAAudioClient12default_implE",
    "name" : "android::IAAudioClient::default_impl",
-   "referenced_type" : "type-502",
+   "referenced_type" : "type-299",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
   {
    "linker_set_key" : "_ZN7android14IAAudioService10descriptorE",
    "name" : "android::IAAudioService::descriptor",
-   "referenced_type" : "type-291",
+   "referenced_type" : "type-162",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android14IAAudioService12default_implE",
    "name" : "android::IAAudioService::default_impl",
-   "referenced_type" : "type-503",
+   "referenced_type" : "type-300",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   }
  ],
@@ -9394,8 +9449,8 @@
    "alignment" : 8,
    "linker_set_key" : "FixedBlockProcessor &",
    "name" : "FixedBlockProcessor &",
-   "referenced_type" : "type-254",
-   "self_type" : "type-257",
+   "referenced_type" : "type-117",
+   "self_type" : "type-120",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/FixedBlockAdapter.h"
   },
@@ -9412,8 +9467,8 @@
    "alignment" : 8,
    "linker_set_key" : "aaudio::AAudioServiceMessage_s &",
    "name" : "aaudio::AAudioServiceMessage_s &",
-   "referenced_type" : "type-321",
-   "self_type" : "type-464",
+   "referenced_type" : "type-198",
+   "self_type" : "type-445",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
@@ -9421,8 +9476,8 @@
    "alignment" : 8,
    "linker_set_key" : "aaudio::AAudioStreamConfiguration &",
    "name" : "aaudio::AAudioStreamConfiguration &",
-   "referenced_type" : "type-104",
-   "self_type" : "type-290",
+   "referenced_type" : "type-149",
+   "self_type" : "type-159",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -9431,7 +9486,7 @@
    "linker_set_key" : "aaudio::AudioEndpointParcelable &",
    "name" : "aaudio::AudioEndpointParcelable &",
    "referenced_type" : "type-28",
-   "self_type" : "type-107",
+   "self_type" : "type-501",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9439,8 +9494,8 @@
    "alignment" : 8,
    "linker_set_key" : "const aaudio::AAudioStreamConfiguration &",
    "name" : "const aaudio::AAudioStreamConfiguration &",
-   "referenced_type" : "type-122",
-   "self_type" : "type-289",
+   "referenced_type" : "type-158",
+   "self_type" : "type-157",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -9449,7 +9504,7 @@
    "linker_set_key" : "const aaudio::AAudioStreamParameters &",
    "name" : "const aaudio::AAudioStreamParameters &",
    "referenced_type" : "type-2",
-   "self_type" : "type-343",
+   "self_type" : "type-220",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AAudioStreamParameters.h"
   },
@@ -9457,8 +9512,8 @@
    "alignment" : 8,
    "linker_set_key" : "const aaudio::AAudioStreamRequest &",
    "name" : "const aaudio::AAudioStreamRequest &",
-   "referenced_type" : "type-102",
-   "self_type" : "type-101",
+   "referenced_type" : "type-154",
+   "self_type" : "type-500",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -9466,8 +9521,8 @@
    "alignment" : 8,
    "linker_set_key" : "const aaudio::AudioStreamBuilder &",
    "name" : "const aaudio::AudioStreamBuilder &",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1042",
+   "referenced_type" : "type-1122",
+   "self_type" : "type-1124",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
@@ -9475,17 +9530,8 @@
    "alignment" : 8,
    "linker_set_key" : "const aaudio::AudioStreamBuilder &",
    "name" : "const aaudio::AudioStreamBuilder &",
-   "referenced_type" : "type-1344",
-   "self_type" : "type-1346",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const aaudio::AudioStreamBuilder &",
-   "name" : "const aaudio::AudioStreamBuilder &",
-   "referenced_type" : "type-369",
-   "self_type" : "type-375",
+   "referenced_type" : "type-246",
+   "self_type" : "type-248",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -9493,8 +9539,8 @@
    "alignment" : 8,
    "linker_set_key" : "const aaudio::AudioStreamBuilder &",
    "name" : "const aaudio::AudioStreamBuilder &",
-   "referenced_type" : "type-75",
-   "self_type" : "type-77",
+   "referenced_type" : "type-472",
+   "self_type" : "type-474",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
@@ -9502,8 +9548,17 @@
    "alignment" : 8,
    "linker_set_key" : "const aaudio::AudioStreamBuilder &",
    "name" : "const aaudio::AudioStreamBuilder &",
-   "referenced_type" : "type-824",
-   "self_type" : "type-826",
+   "referenced_type" : "type-773",
+   "self_type" : "type-775",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const aaudio::AudioStreamBuilder &",
+   "name" : "const aaudio::AudioStreamBuilder &",
+   "referenced_type" : "type-989",
+   "self_type" : "type-991",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
@@ -9511,8 +9566,62 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AudioClient &",
    "name" : "const android::AudioClient &",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-1019",
+   "self_type" : "type-1021",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::AudioClient &",
+   "name" : "const android::AudioClient &",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1065",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::AudioClient &",
+   "name" : "const android::AudioClient &",
+   "referenced_type" : "type-1152",
+   "self_type" : "type-1154",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::AudioClient &",
+   "name" : "const android::AudioClient &",
+   "referenced_type" : "type-1196",
+   "self_type" : "type-1199",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::AudioClient &",
+   "name" : "const android::AudioClient &",
+   "referenced_type" : "type-1311",
+   "self_type" : "type-1313",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::AudioClient &",
+   "name" : "const android::AudioClient &",
+   "referenced_type" : "type-1390",
+   "self_type" : "type-1392",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::AudioClient &",
+   "name" : "const android::AudioClient &",
+   "referenced_type" : "type-1449",
+   "self_type" : "type-1451",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
@@ -9520,665 +9629,611 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AudioClient &",
    "name" : "const android::AudioClient &",
-   "referenced_type" : "type-1070",
-   "self_type" : "type-1072",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::AudioClient &",
-   "name" : "const android::AudioClient &",
-   "referenced_type" : "type-108",
-   "self_type" : "type-110",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::AudioClient &",
-   "name" : "const android::AudioClient &",
-   "referenced_type" : "type-1114",
-   "self_type" : "type-1116",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::AudioClient &",
-   "name" : "const android::AudioClient &",
-   "referenced_type" : "type-1240",
-   "self_type" : "type-1242",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::AudioClient &",
-   "name" : "const android::AudioClient &",
-   "referenced_type" : "type-1315",
-   "self_type" : "type-1317",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::AudioClient &",
-   "name" : "const android::AudioClient &",
-   "referenced_type" : "type-1374",
-   "self_type" : "type-1376",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::AudioClient &",
-   "name" : "const android::AudioClient &",
-   "referenced_type" : "type-1418",
-   "self_type" : "type-1420",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::AudioClient &",
-   "name" : "const android::AudioClient &",
-   "referenced_type" : "type-158",
-   "self_type" : "type-160",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::AudioClient &",
-   "name" : "const android::AudioClient &",
-   "referenced_type" : "type-304",
-   "self_type" : "type-306",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::AudioClient &",
-   "name" : "const android::AudioClient &",
-   "referenced_type" : "type-394",
-   "self_type" : "type-396",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::AudioClient &",
-   "name" : "const android::AudioClient &",
-   "referenced_type" : "type-461",
-   "self_type" : "type-463",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::AudioClient &",
-   "name" : "const android::AudioClient &",
-   "referenced_type" : "type-570",
-   "self_type" : "type-572",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::AudioClient &",
-   "name" : "const android::AudioClient &",
-   "referenced_type" : "type-720",
-   "self_type" : "type-722",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::AudioClient &",
-   "name" : "const android::AudioClient &",
-   "referenced_type" : "type-795",
-   "self_type" : "type-797",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::AudioClient &",
-   "name" : "const android::AudioClient &",
-   "referenced_type" : "type-854",
-   "self_type" : "type-856",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::AudioClient &",
-   "name" : "const android::AudioClient &",
-   "referenced_type" : "type-936",
-   "self_type" : "type-938",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Parcel &",
-   "name" : "const android::Parcel &",
-   "referenced_type" : "type-1106",
-   "self_type" : "type-1108",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Parcel &",
-   "name" : "const android::Parcel &",
-   "referenced_type" : "type-1133",
-   "self_type" : "type-1135",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Parcel &",
-   "name" : "const android::Parcel &",
-   "referenced_type" : "type-1410",
-   "self_type" : "type-1412",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Parcel &",
-   "name" : "const android::Parcel &",
-   "referenced_type" : "type-1437",
-   "self_type" : "type-1439",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Parcel &",
-   "name" : "const android::Parcel &",
-   "referenced_type" : "type-148",
-   "self_type" : "type-150",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Parcel &",
-   "name" : "const android::Parcel &",
-   "referenced_type" : "type-186",
-   "self_type" : "type-188",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::String16 &",
-   "name" : "const android::String16 &",
-   "referenced_type" : "type-1091",
-   "self_type" : "type-1096",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::String16 &",
-   "name" : "const android::String16 &",
-   "referenced_type" : "type-1120",
-   "self_type" : "type-1125",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::String16 &",
-   "name" : "const android::String16 &",
-   "referenced_type" : "type-130",
-   "self_type" : "type-135",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::String16 &",
-   "name" : "const android::String16 &",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1400",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::String16 &",
-   "name" : "const android::String16 &",
-   "referenced_type" : "type-1424",
-   "self_type" : "type-1429",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::String16 &",
-   "name" : "const android::String16 &",
-   "referenced_type" : "type-167",
-   "self_type" : "type-172",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "referenced_type" : "type-1050",
-   "self_type" : "type-1052",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "referenced_type" : "type-1148",
-   "self_type" : "type-1150",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1356",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "referenced_type" : "type-1452",
-   "self_type" : "type-1454",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "referenced_type" : "type-203",
-   "self_type" : "type-205",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "referenced_type" : "type-82",
-   "self_type" : "type-84",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
-   "referenced_type" : "type-834",
-   "self_type" : "type-836",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::IAAudioClient> &",
-   "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-1065",
-   "self_type" : "type-1067",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::IAAudioClient> &",
-   "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-1111",
-   "self_type" : "type-1113",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::IAAudioClient> &",
-   "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-1237",
-   "self_type" : "type-1239",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::IAAudioClient> &",
-   "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-1369",
-   "self_type" : "type-1371",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::IAAudioClient> &",
-   "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-1415",
-   "self_type" : "type-1417",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::IAAudioClient> &",
-   "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-155",
-   "self_type" : "type-157",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::IAAudioClient> &",
-   "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-301",
-   "self_type" : "type-303",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::IAAudioClient> &",
-   "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-391",
-   "self_type" : "type-393",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::IAAudioClient> &",
-   "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-567",
-   "self_type" : "type-569",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::IAAudioClient> &",
-   "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-717",
-   "self_type" : "type-719",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::IAAudioClient> &",
-   "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-849",
-   "self_type" : "type-851",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::IAAudioClient> &",
-   "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-933",
-   "self_type" : "type-935",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::IAAudioClient> &",
-   "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-98",
-   "self_type" : "type-100",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::IBinder> &",
-   "name" : "const android::sp<android::IBinder> &",
-   "referenced_type" : "type-1093",
-   "self_type" : "type-1095",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::IBinder> &",
-   "name" : "const android::sp<android::IBinder> &",
-   "referenced_type" : "type-1122",
-   "self_type" : "type-1124",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::IBinder> &",
-   "name" : "const android::sp<android::IBinder> &",
-   "referenced_type" : "type-132",
-   "self_type" : "type-134",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::IBinder> &",
-   "name" : "const android::sp<android::IBinder> &",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1399",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::IBinder> &",
-   "name" : "const android::sp<android::IBinder> &",
-   "referenced_type" : "type-1426",
-   "self_type" : "type-1428",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::IBinder> &",
-   "name" : "const android::sp<android::IBinder> &",
-   "referenced_type" : "type-169",
-   "self_type" : "type-171",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::IBinder> &",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-1073",
-   "self_type" : "type-1075",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::IBinder> &",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-111",
-   "self_type" : "type-113",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::IBinder> &",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-1117",
-   "self_type" : "type-1119",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::IBinder> &",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-1246",
-   "self_type" : "type-1248",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::IBinder> &",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1379",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::IBinder> &",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1423",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::IBinder> &",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-162",
-   "self_type" : "type-164",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::IBinder> &",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-311",
-   "self_type" : "type-313",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::IBinder> &",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-398",
-   "self_type" : "type-400",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::IBinder> &",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-576",
-   "self_type" : "type-578",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::IBinder> &",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-726",
-   "self_type" : "type-728",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::IBinder> &",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-857",
-   "self_type" : "type-859",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::IBinder> &",
-   "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-942",
-   "self_type" : "type-944",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> > &",
-   "name" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> > &",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1100",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> > &",
-   "name" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> > &",
-   "referenced_type" : "type-1405",
-   "self_type" : "type-1404",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> > &",
-   "name" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> > &",
-   "referenced_type" : "type-143",
-   "self_type" : "type-142",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> > &",
-   "name" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> > &",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1129",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> > &",
-   "name" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> > &",
-   "referenced_type" : "type-1434",
-   "self_type" : "type-1433",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> > &",
-   "name" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> > &",
    "referenced_type" : "type-181",
+   "self_type" : "type-183",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::AudioClient &",
+   "name" : "const android::AudioClient &",
+   "referenced_type" : "type-367",
+   "self_type" : "type-369",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::AudioClient &",
+   "name" : "const android::AudioClient &",
+   "referenced_type" : "type-442",
+   "self_type" : "type-444",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::AudioClient &",
+   "name" : "const android::AudioClient &",
+   "referenced_type" : "type-502",
+   "self_type" : "type-504",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::AudioClient &",
+   "name" : "const android::AudioClient &",
+   "referenced_type" : "type-546",
+   "self_type" : "type-548",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::AudioClient &",
+   "name" : "const android::AudioClient &",
+   "referenced_type" : "type-669",
+   "self_type" : "type-671",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::AudioClient &",
+   "name" : "const android::AudioClient &",
+   "referenced_type" : "type-744",
+   "self_type" : "type-746",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::AudioClient &",
+   "name" : "const android::AudioClient &",
+   "referenced_type" : "type-803",
+   "self_type" : "type-805",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::AudioClient &",
+   "name" : "const android::AudioClient &",
+   "referenced_type" : "type-885",
+   "self_type" : "type-887",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::AudioClient &",
+   "name" : "const android::AudioClient &",
+   "referenced_type" : "type-960",
+   "self_type" : "type-962",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-1055",
+   "self_type" : "type-1057",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1084",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1188",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-1217",
+   "self_type" : "type-1219",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-538",
+   "self_type" : "type-540",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-565",
+   "self_type" : "type-567",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::String16 &",
+   "name" : "const android::String16 &",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1045",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::String16 &",
+   "name" : "const android::String16 &",
+   "referenced_type" : "type-1069",
+   "self_type" : "type-1074",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::String16 &",
+   "name" : "const android::String16 &",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1178",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::String16 &",
+   "name" : "const android::String16 &",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1209",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::String16 &",
+   "name" : "const android::String16 &",
+   "referenced_type" : "type-523",
+   "self_type" : "type-528",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::String16 &",
+   "name" : "const android::String16 &",
+   "referenced_type" : "type-552",
+   "self_type" : "type-557",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
+   "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
+   "referenced_type" : "type-1097",
+   "self_type" : "type-1099",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
+   "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
+   "referenced_type" : "type-1130",
+   "self_type" : "type-1132",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
+   "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
+   "referenced_type" : "type-1235",
+   "self_type" : "type-1237",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
+   "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
+   "referenced_type" : "type-482",
+   "self_type" : "type-484",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
+   "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
+   "referenced_type" : "type-580",
+   "self_type" : "type-582",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
+   "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
+   "referenced_type" : "type-783",
+   "self_type" : "type-785",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
+   "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> &",
+   "referenced_type" : "type-999",
+   "self_type" : "type-1001",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IAAudioClient> &",
+   "name" : "const android::sp<android::IAAudioClient> &",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1016",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IAAudioClient> &",
+   "name" : "const android::sp<android::IAAudioClient> &",
+   "referenced_type" : "type-1060",
+   "self_type" : "type-1062",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IAAudioClient> &",
+   "name" : "const android::sp<android::IAAudioClient> &",
+   "referenced_type" : "type-1147",
+   "self_type" : "type-1149",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IAAudioClient> &",
+   "name" : "const android::sp<android::IAAudioClient> &",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1195",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IAAudioClient> &",
+   "name" : "const android::sp<android::IAAudioClient> &",
+   "referenced_type" : "type-1308",
+   "self_type" : "type-1310",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IAAudioClient> &",
+   "name" : "const android::sp<android::IAAudioClient> &",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1389",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IAAudioClient> &",
+   "name" : "const android::sp<android::IAAudioClient> &",
+   "referenced_type" : "type-178",
    "self_type" : "type-180",
    "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IAAudioClient> &",
+   "name" : "const android::sp<android::IAAudioClient> &",
+   "referenced_type" : "type-364",
+   "self_type" : "type-366",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IAAudioClient> &",
+   "name" : "const android::sp<android::IAAudioClient> &",
+   "referenced_type" : "type-497",
+   "self_type" : "type-499",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IAAudioClient> &",
+   "name" : "const android::sp<android::IAAudioClient> &",
+   "referenced_type" : "type-543",
+   "self_type" : "type-545",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IAAudioClient> &",
+   "name" : "const android::sp<android::IAAudioClient> &",
+   "referenced_type" : "type-666",
+   "self_type" : "type-668",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IAAudioClient> &",
+   "name" : "const android::sp<android::IAAudioClient> &",
+   "referenced_type" : "type-798",
+   "self_type" : "type-800",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IAAudioClient> &",
+   "name" : "const android::sp<android::IAAudioClient> &",
+   "referenced_type" : "type-882",
+   "self_type" : "type-884",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IBinder> &",
+   "name" : "const android::sp<android::IBinder> &",
+   "referenced_type" : "type-1042",
+   "self_type" : "type-1044",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IBinder> &",
+   "name" : "const android::sp<android::IBinder> &",
+   "referenced_type" : "type-1071",
+   "self_type" : "type-1073",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IBinder> &",
+   "name" : "const android::sp<android::IBinder> &",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1177",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IBinder> &",
+   "name" : "const android::sp<android::IBinder> &",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1208",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IBinder> &",
+   "name" : "const android::sp<android::IBinder> &",
+   "referenced_type" : "type-525",
+   "self_type" : "type-527",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IBinder> &",
+   "name" : "const android::sp<android::IBinder> &",
+   "referenced_type" : "type-554",
+   "self_type" : "type-556",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::IBinder> &",
+   "name" : "const android::wp<android::IBinder> &",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1024",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::IBinder> &",
+   "name" : "const android::wp<android::IBinder> &",
+   "referenced_type" : "type-1066",
+   "self_type" : "type-1068",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::IBinder> &",
+   "name" : "const android::wp<android::IBinder> &",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1157",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::IBinder> &",
+   "name" : "const android::wp<android::IBinder> &",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1202",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::IBinder> &",
+   "name" : "const android::wp<android::IBinder> &",
+   "referenced_type" : "type-1317",
+   "self_type" : "type-1319",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::IBinder> &",
+   "name" : "const android::wp<android::IBinder> &",
+   "referenced_type" : "type-1394",
+   "self_type" : "type-1396",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::IBinder> &",
+   "name" : "const android::wp<android::IBinder> &",
+   "referenced_type" : "type-188",
+   "self_type" : "type-190",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::IBinder> &",
+   "name" : "const android::wp<android::IBinder> &",
+   "referenced_type" : "type-373",
+   "self_type" : "type-375",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::IBinder> &",
+   "name" : "const android::wp<android::IBinder> &",
+   "referenced_type" : "type-505",
+   "self_type" : "type-507",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::IBinder> &",
+   "name" : "const android::wp<android::IBinder> &",
+   "referenced_type" : "type-549",
+   "self_type" : "type-551",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::IBinder> &",
+   "name" : "const android::wp<android::IBinder> &",
+   "referenced_type" : "type-675",
+   "self_type" : "type-677",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::IBinder> &",
+   "name" : "const android::wp<android::IBinder> &",
+   "referenced_type" : "type-806",
+   "self_type" : "type-808",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::IBinder> &",
+   "name" : "const android::wp<android::IBinder> &",
+   "referenced_type" : "type-891",
+   "self_type" : "type-893",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> > &",
+   "name" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> > &",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1049",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> > &",
+   "name" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> > &",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1182",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> > &",
+   "name" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> > &",
+   "referenced_type" : "type-533",
+   "self_type" : "type-532",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> > &",
+   "name" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> > &",
+   "referenced_type" : "type-1079",
+   "self_type" : "type-1078",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> > &",
+   "name" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> > &",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1213",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> > &",
+   "name" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> > &",
+   "referenced_type" : "type-562",
+   "self_type" : "type-561",
+   "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "flowgraph::AudioProcessorBase &",
    "name" : "flowgraph::AudioProcessorBase &",
-   "referenced_type" : "type-165",
-   "self_type" : "type-178",
+   "referenced_type" : "type-71",
+   "self_type" : "type-74",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/AudioProcessorBase.h"
   }
@@ -10189,8 +10244,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioFlowGraph *",
    "name" : "AAudioFlowGraph *",
-   "referenced_type" : "type-69",
-   "self_type" : "type-448",
+   "referenced_type" : "type-105",
+   "self_type" : "type-262",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AAudioFlowGraph.h"
   },
@@ -10198,8 +10253,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamBuilderStruct *",
    "name" : "AAudioStreamBuilderStruct *",
-   "referenced_type" : "type-1263",
-   "self_type" : "type-1262",
+   "referenced_type" : "type-1334",
+   "self_type" : "type-1333",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10207,8 +10262,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamBuilderStruct *",
    "name" : "AAudioStreamBuilderStruct *",
-   "referenced_type" : "type-337",
-   "self_type" : "type-336",
+   "referenced_type" : "type-1403",
+   "self_type" : "type-1402",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10216,8 +10271,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamBuilderStruct *",
    "name" : "AAudioStreamBuilderStruct *",
-   "referenced_type" : "type-407",
-   "self_type" : "type-406",
+   "referenced_type" : "type-214",
+   "self_type" : "type-213",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10225,8 +10280,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamBuilderStruct *",
    "name" : "AAudioStreamBuilderStruct *",
-   "referenced_type" : "type-593",
-   "self_type" : "type-592",
+   "referenced_type" : "type-390",
+   "self_type" : "type-389",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10234,8 +10289,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamBuilderStruct *",
    "name" : "AAudioStreamBuilderStruct *",
-   "referenced_type" : "type-743",
-   "self_type" : "type-742",
+   "referenced_type" : "type-692",
+   "self_type" : "type-691",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10243,8 +10298,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamBuilderStruct *",
    "name" : "AAudioStreamBuilderStruct *",
-   "referenced_type" : "type-959",
-   "self_type" : "type-958",
+   "referenced_type" : "type-908",
+   "self_type" : "type-907",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10252,8 +10307,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamBuilderStruct **",
    "name" : "AAudioStreamBuilderStruct **",
-   "referenced_type" : "type-1262",
-   "self_type" : "type-1266",
+   "referenced_type" : "type-1333",
+   "self_type" : "type-1337",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10261,8 +10316,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamBuilderStruct **",
    "name" : "AAudioStreamBuilderStruct **",
-   "referenced_type" : "type-336",
-   "self_type" : "type-340",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1406",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10270,8 +10325,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamBuilderStruct **",
    "name" : "AAudioStreamBuilderStruct **",
-   "referenced_type" : "type-406",
-   "self_type" : "type-410",
+   "referenced_type" : "type-213",
+   "self_type" : "type-217",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10279,8 +10334,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamBuilderStruct **",
    "name" : "AAudioStreamBuilderStruct **",
-   "referenced_type" : "type-592",
-   "self_type" : "type-596",
+   "referenced_type" : "type-389",
+   "self_type" : "type-393",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10288,8 +10343,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamBuilderStruct **",
    "name" : "AAudioStreamBuilderStruct **",
-   "referenced_type" : "type-742",
-   "self_type" : "type-746",
+   "referenced_type" : "type-691",
+   "self_type" : "type-695",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10297,8 +10352,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamBuilderStruct **",
    "name" : "AAudioStreamBuilderStruct **",
-   "referenced_type" : "type-958",
-   "self_type" : "type-962",
+   "referenced_type" : "type-907",
+   "self_type" : "type-911",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10306,8 +10361,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1052",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10315,8 +10370,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1032",
+   "referenced_type" : "type-1120",
+   "self_type" : "type-1119",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10324,26 +10379,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-1038",
-   "self_type" : "type-1037",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-1105",
-   "self_type" : "type-1104",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-1257",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1328",
+   "self_type" : "type-1327",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10351,8 +10388,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-1261",
-   "self_type" : "type-1260",
+   "referenced_type" : "type-1332",
+   "self_type" : "type-1331",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10360,8 +10397,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-1273",
-   "self_type" : "type-1272",
+   "referenced_type" : "type-1344",
+   "self_type" : "type-1343",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10369,8 +10406,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1282",
+   "referenced_type" : "type-1354",
+   "self_type" : "type-1353",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10378,8 +10415,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-1290",
-   "self_type" : "type-1289",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1360",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10387,8 +10424,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-1330",
-   "self_type" : "type-1329",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1370",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10396,8 +10433,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-1337",
-   "self_type" : "type-1336",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1376",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10405,26 +10442,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-1342",
-   "self_type" : "type-1341",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-1409",
-   "self_type" : "type-1408",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-334",
-   "self_type" : "type-333",
+   "referenced_type" : "type-1400",
+   "self_type" : "type-1399",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10432,8 +10451,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-347",
-   "self_type" : "type-346",
+   "referenced_type" : "type-1412",
+   "self_type" : "type-1411",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10441,8 +10460,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-356",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1420",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10450,8 +10469,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-363",
-   "self_type" : "type-362",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1427",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10459,8 +10478,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-374",
-   "self_type" : "type-373",
+   "referenced_type" : "type-1444",
+   "self_type" : "type-1443",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10468,8 +10487,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-380",
-   "self_type" : "type-379",
+   "referenced_type" : "type-1461",
+   "self_type" : "type-1460",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10477,8 +10496,17 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-404",
-   "self_type" : "type-403",
+   "referenced_type" : "type-1469",
+   "self_type" : "type-1468",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-211",
+   "self_type" : "type-210",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10486,6 +10514,78 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-224",
+   "self_type" : "type-223",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-234",
+   "self_type" : "type-233",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-240",
+   "self_type" : "type-239",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-282",
+   "self_type" : "type-281",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-384",
+   "self_type" : "type-383",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-388",
+   "self_type" : "type-387",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-400",
+   "self_type" : "type-399",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-410",
+   "self_type" : "type-409",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
    "referenced_type" : "type-417",
    "self_type" : "type-416",
    "size" : 8,
@@ -10495,8 +10595,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-425",
-   "self_type" : "type-424",
+   "referenced_type" : "type-458",
+   "self_type" : "type-457",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10504,8 +10604,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-431",
-   "self_type" : "type-430",
+   "referenced_type" : "type-465",
+   "self_type" : "type-464",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10513,26 +10613,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-456",
-   "self_type" : "type-455",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-474",
-   "self_type" : "type-473",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-481",
-   "self_type" : "type-480",
+   "referenced_type" : "type-470",
+   "self_type" : "type-469",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10549,8 +10631,17 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-587",
-   "self_type" : "type-586",
+   "referenced_type" : "type-536",
+   "self_type" : "type-535",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-686",
+   "self_type" : "type-685",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10558,8 +10649,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-591",
-   "self_type" : "type-590",
+   "referenced_type" : "type-690",
+   "self_type" : "type-689",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10567,8 +10658,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-603",
-   "self_type" : "type-602",
+   "referenced_type" : "type-702",
+   "self_type" : "type-701",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10576,8 +10667,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-613",
-   "self_type" : "type-612",
+   "referenced_type" : "type-712",
+   "self_type" : "type-711",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10585,8 +10676,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-620",
-   "self_type" : "type-619",
+   "referenced_type" : "type-719",
+   "self_type" : "type-718",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10594,8 +10685,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-652",
-   "self_type" : "type-651",
+   "referenced_type" : "type-759",
+   "self_type" : "type-758",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10603,8 +10694,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-66",
-   "self_type" : "type-65",
+   "referenced_type" : "type-766",
+   "self_type" : "type-765",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10612,8 +10703,26 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-771",
+   "self_type" : "type-770",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-813",
+   "self_type" : "type-812",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "AAudioStreamStruct *",
+   "name" : "AAudioStreamStruct *",
+   "referenced_type" : "type-902",
+   "self_type" : "type-901",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10621,8 +10730,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-741",
-   "self_type" : "type-740",
+   "referenced_type" : "type-906",
+   "self_type" : "type-905",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10630,8 +10739,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-753",
-   "self_type" : "type-752",
+   "referenced_type" : "type-918",
+   "self_type" : "type-917",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10639,8 +10748,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-763",
-   "self_type" : "type-762",
+   "referenced_type" : "type-928",
+   "self_type" : "type-927",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10648,8 +10757,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-770",
-   "self_type" : "type-769",
+   "referenced_type" : "type-935",
+   "self_type" : "type-934",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10657,8 +10766,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-810",
-   "self_type" : "type-809",
+   "referenced_type" : "type-975",
+   "self_type" : "type-974",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10666,8 +10775,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-817",
-   "self_type" : "type-816",
+   "referenced_type" : "type-982",
+   "self_type" : "type-981",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10675,62 +10784,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-822",
-   "self_type" : "type-821",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-864",
-   "self_type" : "type-863",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-953",
-   "self_type" : "type-952",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-957",
-   "self_type" : "type-956",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-969",
-   "self_type" : "type-968",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-979",
-   "self_type" : "type-978",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "AAudioStreamStruct *",
-   "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-986",
-   "self_type" : "type-985",
+   "referenced_type" : "type-987",
+   "self_type" : "type-986",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10738,8 +10793,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct **",
    "name" : "AAudioStreamStruct **",
-   "referenced_type" : "type-1256",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1327",
+   "self_type" : "type-1330",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10747,8 +10802,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct **",
    "name" : "AAudioStreamStruct **",
-   "referenced_type" : "type-333",
-   "self_type" : "type-335",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1401",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10756,8 +10811,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct **",
    "name" : "AAudioStreamStruct **",
-   "referenced_type" : "type-403",
-   "self_type" : "type-405",
+   "referenced_type" : "type-210",
+   "self_type" : "type-212",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10765,8 +10820,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct **",
    "name" : "AAudioStreamStruct **",
-   "referenced_type" : "type-586",
-   "self_type" : "type-589",
+   "referenced_type" : "type-383",
+   "self_type" : "type-386",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10774,8 +10829,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct **",
    "name" : "AAudioStreamStruct **",
-   "referenced_type" : "type-736",
-   "self_type" : "type-739",
+   "referenced_type" : "type-685",
+   "self_type" : "type-688",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10783,8 +10838,8 @@
    "alignment" : 8,
    "linker_set_key" : "AAudioStreamStruct **",
    "name" : "AAudioStreamStruct **",
-   "referenced_type" : "type-952",
-   "self_type" : "type-955",
+   "referenced_type" : "type-901",
+   "self_type" : "type-904",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -10793,7 +10848,7 @@
    "linker_set_key" : "AtomicRequestor *",
    "name" : "AtomicRequestor *",
    "referenced_type" : "type-24",
-   "self_type" : "type-285",
+   "self_type" : "type-148",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/AAudioUtilities.h"
   },
@@ -10801,8 +10856,8 @@
    "alignment" : 8,
    "linker_set_key" : "FixedBlockAdapter *",
    "name" : "FixedBlockAdapter *",
-   "referenced_type" : "type-256",
-   "self_type" : "type-259",
+   "referenced_type" : "type-119",
+   "self_type" : "type-122",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/FixedBlockAdapter.h"
   },
@@ -10810,8 +10865,8 @@
    "alignment" : 8,
    "linker_set_key" : "FixedBlockProcessor *",
    "name" : "FixedBlockProcessor *",
-   "referenced_type" : "type-254",
-   "self_type" : "type-255",
+   "referenced_type" : "type-117",
+   "self_type" : "type-118",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/FixedBlockAdapter.h"
   },
@@ -10819,8 +10874,8 @@
    "alignment" : 8,
    "linker_set_key" : "FixedBlockReader *",
    "name" : "FixedBlockReader *",
-   "referenced_type" : "type-278",
-   "self_type" : "type-279",
+   "referenced_type" : "type-141",
+   "self_type" : "type-142",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/FixedBlockReader.h"
   },
@@ -10828,8 +10883,8 @@
    "alignment" : 8,
    "linker_set_key" : "FixedBlockWriter *",
    "name" : "FixedBlockWriter *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-269",
+   "referenced_type" : "type-131",
+   "self_type" : "type-132",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/FixedBlockWriter.h"
   },
@@ -10837,8 +10892,8 @@
    "alignment" : 8,
    "linker_set_key" : "MonotonicCounter *",
    "name" : "MonotonicCounter *",
-   "referenced_type" : "type-223",
-   "self_type" : "type-249",
+   "referenced_type" : "type-80",
+   "self_type" : "type-112",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/MonotonicCounter.h"
   },
@@ -10847,7 +10902,7 @@
    "linker_set_key" : "SimpleDoubleBuffer<Timestamp> *",
    "name" : "SimpleDoubleBuffer<Timestamp> *",
    "referenced_type" : "type-20",
-   "self_type" : "type-466",
+   "self_type" : "type-448",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/AAudioUtilities.h"
   },
@@ -10856,7 +10911,7 @@
    "linker_set_key" : "Timestamp *",
    "name" : "Timestamp *",
    "referenced_type" : "type-22",
-   "self_type" : "type-397",
+   "self_type" : "type-273",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/AAudioUtilities.h"
   },
@@ -10864,8 +10919,8 @@
    "alignment" : 8,
    "linker_set_key" : "aaudio::AAudioBinderClient *",
    "name" : "aaudio::AAudioBinderClient *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-300",
+   "referenced_type" : "type-171",
+   "self_type" : "type-177",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10873,8 +10928,8 @@
    "alignment" : 8,
    "linker_set_key" : "aaudio::AAudioBinderClient::AAudioClient *",
    "name" : "aaudio::AAudioBinderClient::AAudioClient *",
-   "referenced_type" : "type-307",
-   "self_type" : "type-310",
+   "referenced_type" : "type-184",
+   "self_type" : "type-187",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -10883,7 +10938,7 @@
    "linker_set_key" : "aaudio::AAudioServiceInterface *",
    "name" : "aaudio::AAudioServiceInterface *",
    "referenced_type" : "type-19",
-   "self_type" : "type-293",
+   "self_type" : "type-166",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioServiceInterface.h"
   },
@@ -10891,8 +10946,8 @@
    "alignment" : 8,
    "linker_set_key" : "aaudio::AAudioServiceMessage_s *",
    "name" : "aaudio::AAudioServiceMessage_s *",
-   "referenced_type" : "type-321",
-   "self_type" : "type-460",
+   "referenced_type" : "type-198",
+   "self_type" : "type-439",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioEndpoint.h"
   },
@@ -10900,8 +10955,8 @@
    "alignment" : 8,
    "linker_set_key" : "aaudio::AAudioStreamConfiguration *",
    "name" : "aaudio::AAudioStreamConfiguration *",
-   "referenced_type" : "type-104",
-   "self_type" : "type-119",
+   "referenced_type" : "type-149",
+   "self_type" : "type-514",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -10910,7 +10965,7 @@
    "linker_set_key" : "aaudio::AAudioStreamParameters *",
    "name" : "aaudio::AAudioStreamParameters *",
    "referenced_type" : "type-3",
-   "self_type" : "type-153",
+   "self_type" : "type-68",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AAudioStreamParameters.h"
   },
@@ -10918,8 +10973,8 @@
    "alignment" : 8,
    "linker_set_key" : "aaudio::AAudioStreamRequest *",
    "name" : "aaudio::AAudioStreamRequest *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-288",
+   "referenced_type" : "type-152",
+   "self_type" : "type-156",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -10928,7 +10983,7 @@
    "linker_set_key" : "aaudio::AudioEndpoint *",
    "name" : "aaudio::AudioEndpoint *",
    "referenced_type" : "type-10",
-   "self_type" : "type-457",
+   "self_type" : "type-436",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioEndpoint.h"
   },
@@ -10937,7 +10992,7 @@
    "linker_set_key" : "aaudio::AudioEndpointParcelable *",
    "name" : "aaudio::AudioEndpointParcelable *",
    "referenced_type" : "type-28",
-   "self_type" : "type-81",
+   "self_type" : "type-481",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -10946,7 +11001,7 @@
    "linker_set_key" : "aaudio::AudioStream *",
    "name" : "aaudio::AudioStream *",
    "referenced_type" : "type-42",
-   "self_type" : "type-253",
+   "self_type" : "type-116",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10954,8 +11009,8 @@
    "alignment" : 8,
    "linker_set_key" : "aaudio::AudioStream **",
    "name" : "aaudio::AudioStream **",
-   "referenced_type" : "type-253",
-   "self_type" : "type-252",
+   "referenced_type" : "type-116",
+   "self_type" : "type-115",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStreamBuilder.h"
   },
@@ -10963,8 +11018,8 @@
    "alignment" : 8,
    "linker_set_key" : "aaudio::AudioStream::MyPlayerBase *",
    "name" : "aaudio::AudioStream::MyPlayerBase *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-383",
+   "referenced_type" : "type-260",
+   "self_type" : "type-269",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10972,8 +11027,8 @@
    "alignment" : 8,
    "linker_set_key" : "aaudio::AudioStreamBuilder *",
    "name" : "aaudio::AudioStreamBuilder *",
-   "referenced_type" : "type-370",
-   "self_type" : "type-387",
+   "referenced_type" : "type-247",
+   "self_type" : "type-271",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStreamBuilder.h"
   },
@@ -10982,7 +11037,7 @@
    "linker_set_key" : "aaudio::AudioStreamInternal *",
    "name" : "aaudio::AudioStreamInternal *",
    "referenced_type" : "type-6",
-   "self_type" : "type-129",
+   "self_type" : "type-66",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
@@ -10990,8 +11045,8 @@
    "alignment" : 8,
    "linker_set_key" : "aaudio::AudioStreamInternalCapture *",
    "name" : "aaudio::AudioStreamInternalCapture *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-475",
+   "referenced_type" : "type-67",
+   "self_type" : "type-459",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalCapture.h"
   },
@@ -10999,8 +11054,8 @@
    "alignment" : 8,
    "linker_set_key" : "aaudio::AudioStreamInternalPlay *",
    "name" : "aaudio::AudioStreamInternalPlay *",
-   "referenced_type" : "type-68",
-   "self_type" : "type-67",
+   "referenced_type" : "type-111",
+   "self_type" : "type-471",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
@@ -11008,8 +11063,8 @@
    "alignment" : 8,
    "linker_set_key" : "aaudio::AudioStreamLegacy *",
    "name" : "aaudio::AudioStreamLegacy *",
-   "referenced_type" : "type-260",
-   "self_type" : "type-263",
+   "referenced_type" : "type-123",
+   "self_type" : "type-126",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -11017,8 +11072,8 @@
    "alignment" : 8,
    "linker_set_key" : "aaudio::AudioStreamLegacy::StreamDeviceCallback *",
    "name" : "aaudio::AudioStreamLegacy::StreamDeviceCallback *",
-   "referenced_type" : "type-264",
-   "self_type" : "type-266",
+   "referenced_type" : "type-127",
+   "self_type" : "type-129",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -11026,8 +11081,8 @@
    "alignment" : 8,
    "linker_set_key" : "aaudio::AudioStreamRecord *",
    "name" : "aaudio::AudioStreamRecord *",
-   "referenced_type" : "type-270",
-   "self_type" : "type-277",
+   "referenced_type" : "type-133",
+   "self_type" : "type-140",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamRecord.h"
   },
@@ -11035,8 +11090,8 @@
    "alignment" : 8,
    "linker_set_key" : "aaudio::AudioStreamTrack *",
    "name" : "aaudio::AudioStreamTrack *",
-   "referenced_type" : "type-280",
-   "self_type" : "type-284",
+   "referenced_type" : "type-143",
+   "self_type" : "type-147",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamTrack.h"
   },
@@ -11045,7 +11100,7 @@
    "linker_set_key" : "aaudio::EndpointDescriptor_s *",
    "name" : "aaudio::EndpointDescriptor_s *",
    "referenced_type" : "type-39",
-   "self_type" : "type-92",
+   "self_type" : "type-492",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -11054,7 +11109,7 @@
    "linker_set_key" : "aaudio::IsochronousClockModel *",
    "name" : "aaudio::IsochronousClockModel *",
    "referenced_type" : "type-7",
-   "self_type" : "type-80",
+   "self_type" : "type-479",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
   },
@@ -11063,7 +11118,7 @@
    "linker_set_key" : "aaudio::RingBufferDescriptor_s *",
    "name" : "aaudio::RingBufferDescriptor_s *",
    "referenced_type" : "type-40",
-   "self_type" : "type-201",
+   "self_type" : "type-579",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11072,7 +11127,7 @@
    "linker_set_key" : "aaudio::RingBufferParcelable *",
    "name" : "aaudio::RingBufferParcelable *",
    "referenced_type" : "type-29",
-   "self_type" : "type-191",
+   "self_type" : "type-570",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11081,7 +11136,7 @@
    "linker_set_key" : "aaudio::SharedMemoryParcelable *",
    "name" : "aaudio::SharedMemoryParcelable *",
    "referenced_type" : "type-35",
-   "self_type" : "type-200",
+   "self_type" : "type-578",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11090,7 +11145,7 @@
    "linker_set_key" : "aaudio::SharedRegionParcelable *",
    "name" : "aaudio::SharedRegionParcelable *",
    "referenced_type" : "type-30",
-   "self_type" : "type-216",
+   "self_type" : "type-590",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -11098,8 +11153,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BnAAudioClient *",
    "name" : "android::BnAAudioClient *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-145",
+   "referenced_type" : "type-164",
+   "self_type" : "type-537",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -11107,8 +11162,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BnAAudioService *",
    "name" : "android::BnAAudioService *",
-   "referenced_type" : "type-184",
-   "self_type" : "type-183",
+   "referenced_type" : "type-169",
+   "self_type" : "type-564",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -11116,8 +11171,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ExtendedTimestamp *",
    "name" : "android::ExtendedTimestamp *",
-   "referenced_type" : "type-1279",
-   "self_type" : "type-1278",
+   "referenced_type" : "type-1350",
+   "self_type" : "type-1349",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -11125,8 +11180,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ExtendedTimestamp *",
    "name" : "android::ExtendedTimestamp *",
-   "referenced_type" : "type-353",
-   "self_type" : "type-352",
+   "referenced_type" : "type-1417",
+   "self_type" : "type-1416",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -11134,8 +11189,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ExtendedTimestamp *",
    "name" : "android::ExtendedTimestamp *",
-   "referenced_type" : "type-421",
-   "self_type" : "type-420",
+   "referenced_type" : "type-230",
+   "self_type" : "type-229",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -11143,8 +11198,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ExtendedTimestamp *",
    "name" : "android::ExtendedTimestamp *",
-   "referenced_type" : "type-609",
-   "self_type" : "type-608",
+   "referenced_type" : "type-406",
+   "self_type" : "type-405",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -11152,8 +11207,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ExtendedTimestamp *",
    "name" : "android::ExtendedTimestamp *",
-   "referenced_type" : "type-759",
-   "self_type" : "type-758",
+   "referenced_type" : "type-708",
+   "self_type" : "type-707",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -11161,8 +11216,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ExtendedTimestamp *",
    "name" : "android::ExtendedTimestamp *",
-   "referenced_type" : "type-975",
-   "self_type" : "type-974",
+   "referenced_type" : "type-924",
+   "self_type" : "type-923",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -11179,8 +11234,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FifoController *",
    "name" : "android::FifoController *",
-   "referenced_type" : "type-441",
-   "self_type" : "type-444",
+   "referenced_type" : "type-255",
+   "self_type" : "type-258",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/fifo/FifoController.h"
   },
@@ -11188,8 +11243,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FifoControllerBase *",
    "name" : "android::FifoControllerBase *",
-   "referenced_type" : "type-324",
-   "self_type" : "type-445",
+   "referenced_type" : "type-201",
+   "self_type" : "type-259",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/fifo/FifoControllerBase.h"
   },
@@ -11197,8 +11252,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FifoControllerIndirect *",
    "name" : "android::FifoControllerIndirect *",
-   "referenced_type" : "type-436",
-   "self_type" : "type-439",
+   "referenced_type" : "type-249",
+   "self_type" : "type-252",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/fifo/FifoControllerIndirect.h"
   },
@@ -11206,8 +11261,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IAAudioClient *",
    "name" : "android::IAAudioClient *",
-   "referenced_type" : "type-137",
-   "self_type" : "type-141",
+   "referenced_type" : "type-160",
+   "self_type" : "type-531",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -11215,8 +11270,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IAAudioService *",
    "name" : "android::IAAudioService *",
-   "referenced_type" : "type-174",
-   "self_type" : "type-179",
+   "referenced_type" : "type-167",
+   "self_type" : "type-560",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -11224,8 +11279,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-1056",
-   "self_type" : "type-1055",
+   "referenced_type" : "type-1005",
+   "self_type" : "type-1004",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -11233,8 +11288,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-1077",
-   "self_type" : "type-1076",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1026",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -11242,8 +11297,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-1085",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-1034",
+   "self_type" : "type-1033",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -11251,8 +11306,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-1110",
-   "self_type" : "type-1109",
+   "referenced_type" : "type-1059",
+   "self_type" : "type-1058",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -11260,8 +11315,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-1137",
-   "self_type" : "type-1136",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1085",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -11269,8 +11324,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1141",
+   "referenced_type" : "type-1091",
+   "self_type" : "type-1090",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11278,17 +11333,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-115",
-   "self_type" : "type-114",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Parcel *",
-   "name" : "android::Parcel *",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1153",
+   "referenced_type" : "type-1103",
+   "self_type" : "type-1102",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -11296,8 +11342,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1161",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1110",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -11305,17 +11351,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-124",
-   "self_type" : "type-123",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Parcel *",
-   "name" : "android::Parcel *",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1135",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -11323,8 +11360,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-1381",
-   "self_type" : "type-1380",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1158",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -11332,8 +11369,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-1389",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1166",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -11341,8 +11378,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1413",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1191",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -11350,8 +11387,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-1441",
-   "self_type" : "type-1440",
+   "referenced_type" : "type-1221",
+   "self_type" : "type-1220",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -11359,8 +11396,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-1446",
-   "self_type" : "type-1445",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1227",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11368,8 +11405,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-1458",
-   "self_type" : "type-1457",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1241",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -11377,8 +11414,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-1466",
-   "self_type" : "type-1465",
+   "referenced_type" : "type-1250",
+   "self_type" : "type-1249",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -11386,53 +11423,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-152",
-   "self_type" : "type-151",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Parcel *",
-   "name" : "android::Parcel *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-189",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Parcel *",
-   "name" : "android::Parcel *",
-   "referenced_type" : "type-196",
-   "self_type" : "type-195",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Parcel *",
-   "name" : "android::Parcel *",
-   "referenced_type" : "type-210",
-   "self_type" : "type-209",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Parcel *",
-   "name" : "android::Parcel *",
-   "referenced_type" : "type-220",
-   "self_type" : "type-219",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Parcel *",
-   "name" : "android::Parcel *",
-   "referenced_type" : "type-840",
-   "self_type" : "type-839",
+   "referenced_type" : "type-488",
+   "self_type" : "type-487",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -11440,8 +11432,71 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-88",
-   "self_type" : "type-87",
+   "referenced_type" : "type-510",
+   "self_type" : "type-509",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Parcel *",
+   "name" : "android::Parcel *",
+   "referenced_type" : "type-517",
+   "self_type" : "type-516",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Parcel *",
+   "name" : "android::Parcel *",
+   "referenced_type" : "type-542",
+   "self_type" : "type-541",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Parcel *",
+   "name" : "android::Parcel *",
+   "referenced_type" : "type-569",
+   "self_type" : "type-568",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Parcel *",
+   "name" : "android::Parcel *",
+   "referenced_type" : "type-574",
+   "self_type" : "type-573",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Parcel *",
+   "name" : "android::Parcel *",
+   "referenced_type" : "type-586",
+   "self_type" : "type-585",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Parcel *",
+   "name" : "android::Parcel *",
+   "referenced_type" : "type-594",
+   "self_type" : "type-593",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Parcel *",
+   "name" : "android::Parcel *",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -11449,8 +11504,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::WrappingBuffer *",
    "name" : "android::WrappingBuffer *",
-   "referenced_type" : "type-327",
-   "self_type" : "type-440",
+   "referenced_type" : "type-204",
+   "self_type" : "type-254",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/fifo/FifoBuffer.h"
   },
@@ -11458,8 +11513,8 @@
    "alignment" : 8,
    "linker_set_key" : "const MonotonicCounter *",
    "name" : "const MonotonicCounter *",
-   "referenced_type" : "type-258",
-   "self_type" : "type-267",
+   "referenced_type" : "type-121",
+   "self_type" : "type-130",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/MonotonicCounter.h"
   },
@@ -11467,8 +11522,8 @@
    "alignment" : 8,
    "linker_set_key" : "const SimpleDoubleBuffer<Timestamp> *",
    "name" : "const SimpleDoubleBuffer<Timestamp> *",
-   "referenced_type" : "type-467",
-   "self_type" : "type-468",
+   "referenced_type" : "type-449",
+   "self_type" : "type-450",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/AAudioUtilities.h"
   },
@@ -11476,8 +11531,8 @@
    "alignment" : 8,
    "linker_set_key" : "const Timestamp *",
    "name" : "const Timestamp *",
-   "referenced_type" : "type-401",
-   "self_type" : "type-402",
+   "referenced_type" : "type-274",
+   "self_type" : "type-275",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/AAudioUtilities.h"
   },
@@ -11485,8 +11540,8 @@
    "alignment" : 8,
    "linker_set_key" : "const aaudio::AAudioStreamConfiguration *",
    "name" : "const aaudio::AAudioStreamConfiguration *",
-   "referenced_type" : "type-122",
-   "self_type" : "type-121",
+   "referenced_type" : "type-158",
+   "self_type" : "type-515",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -11495,7 +11550,7 @@
    "linker_set_key" : "const aaudio::AAudioStreamParameters *",
    "name" : "const aaudio::AAudioStreamParameters *",
    "referenced_type" : "type-2",
-   "self_type" : "type-93",
+   "self_type" : "type-63",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AAudioStreamParameters.h"
   },
@@ -11503,8 +11558,8 @@
    "alignment" : 8,
    "linker_set_key" : "const aaudio::AAudioStreamRequest *",
    "name" : "const aaudio::AAudioStreamRequest *",
-   "referenced_type" : "type-102",
-   "self_type" : "type-287",
+   "referenced_type" : "type-154",
+   "self_type" : "type-155",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -11512,8 +11567,8 @@
    "alignment" : 8,
    "linker_set_key" : "const aaudio::AudioEndpoint *",
    "name" : "const aaudio::AudioEndpoint *",
-   "referenced_type" : "type-432",
-   "self_type" : "type-433",
+   "referenced_type" : "type-277",
+   "self_type" : "type-278",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioEndpoint.h"
   },
@@ -11521,8 +11576,8 @@
    "alignment" : 8,
    "linker_set_key" : "const aaudio::AudioEndpointParcelable *",
    "name" : "const aaudio::AudioEndpointParcelable *",
-   "referenced_type" : "type-85",
-   "self_type" : "type-86",
+   "referenced_type" : "type-485",
+   "self_type" : "type-486",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -11530,8 +11585,8 @@
    "alignment" : 8,
    "linker_set_key" : "const aaudio::AudioStream *",
    "name" : "const aaudio::AudioStream *",
-   "referenced_type" : "type-364",
-   "self_type" : "type-367",
+   "referenced_type" : "type-241",
+   "self_type" : "type-244",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -11539,8 +11594,8 @@
    "alignment" : 8,
    "linker_set_key" : "const aaudio::AudioStreamBuilder *",
    "name" : "const aaudio::AudioStreamBuilder *",
-   "referenced_type" : "type-369",
-   "self_type" : "type-386",
+   "referenced_type" : "type-246",
+   "self_type" : "type-270",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStreamBuilder.h"
   },
@@ -11548,8 +11603,8 @@
    "alignment" : 8,
    "linker_set_key" : "const aaudio::AudioStreamInternal *",
    "name" : "const aaudio::AudioStreamInternal *",
-   "referenced_type" : "type-120",
-   "self_type" : "type-128",
+   "referenced_type" : "type-64",
+   "self_type" : "type-65",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
@@ -11557,8 +11612,8 @@
    "alignment" : 8,
    "linker_set_key" : "const aaudio::AudioStreamInternalCapture *",
    "name" : "const aaudio::AudioStreamInternalCapture *",
-   "referenced_type" : "type-154",
-   "self_type" : "type-161",
+   "referenced_type" : "type-69",
+   "self_type" : "type-70",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalCapture.h"
   },
@@ -11566,8 +11621,8 @@
    "alignment" : 8,
    "linker_set_key" : "const aaudio::AudioStreamInternalPlay *",
    "name" : "const aaudio::AudioStreamInternalPlay *",
-   "referenced_type" : "type-250",
-   "self_type" : "type-251",
+   "referenced_type" : "type-113",
+   "self_type" : "type-114",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
@@ -11575,8 +11630,8 @@
    "alignment" : 8,
    "linker_set_key" : "const aaudio::AudioStreamRecord *",
    "name" : "const aaudio::AudioStreamRecord *",
-   "referenced_type" : "type-275",
-   "self_type" : "type-276",
+   "referenced_type" : "type-138",
+   "self_type" : "type-139",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamRecord.h"
   },
@@ -11584,8 +11639,8 @@
    "alignment" : 8,
    "linker_set_key" : "const aaudio::AudioStreamTrack *",
    "name" : "const aaudio::AudioStreamTrack *",
-   "referenced_type" : "type-282",
-   "self_type" : "type-283",
+   "referenced_type" : "type-145",
+   "self_type" : "type-146",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamTrack.h"
   },
@@ -11593,8 +11648,8 @@
    "alignment" : 8,
    "linker_set_key" : "const aaudio::EndpointDescriptor_s *",
    "name" : "const aaudio::EndpointDescriptor_s *",
-   "referenced_type" : "type-458",
-   "self_type" : "type-459",
+   "referenced_type" : "type-437",
+   "self_type" : "type-438",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioEndpoint.h"
   },
@@ -11602,8 +11657,8 @@
    "alignment" : 8,
    "linker_set_key" : "const aaudio::IsochronousClockModel *",
    "name" : "const aaudio::IsochronousClockModel *",
-   "referenced_type" : "type-314",
-   "self_type" : "type-315",
+   "referenced_type" : "type-191",
+   "self_type" : "type-192",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
   },
@@ -11611,8 +11666,8 @@
    "alignment" : 8,
    "linker_set_key" : "const aaudio::RingBufferParcelable *",
    "name" : "const aaudio::RingBufferParcelable *",
-   "referenced_type" : "type-192",
-   "self_type" : "type-194",
+   "referenced_type" : "type-571",
+   "self_type" : "type-572",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11620,8 +11675,8 @@
    "alignment" : 8,
    "linker_set_key" : "const aaudio::SharedMemoryParcelable *",
    "name" : "const aaudio::SharedMemoryParcelable *",
-   "referenced_type" : "type-206",
-   "self_type" : "type-207",
+   "referenced_type" : "type-583",
+   "self_type" : "type-584",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -11629,8 +11684,8 @@
    "alignment" : 8,
    "linker_set_key" : "const aaudio::SharedRegionParcelable *",
    "name" : "const aaudio::SharedRegionParcelable *",
-   "referenced_type" : "type-217",
-   "self_type" : "type-218",
+   "referenced_type" : "type-591",
+   "self_type" : "type-592",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -11638,8 +11693,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FifoControllerBase *",
    "name" : "const android::FifoControllerBase *",
-   "referenced_type" : "type-325",
-   "self_type" : "type-326",
+   "referenced_type" : "type-202",
+   "self_type" : "type-203",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/fifo/FifoControllerBase.h"
   },
@@ -11647,8 +11702,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IAAudioClient *",
    "name" : "const android::IAAudioClient *",
-   "referenced_type" : "type-136",
-   "self_type" : "type-140",
+   "referenced_type" : "type-529",
+   "self_type" : "type-530",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -11656,8 +11711,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IAAudioService *",
    "name" : "const android::IAAudioService *",
-   "referenced_type" : "type-173",
-   "self_type" : "type-176",
+   "referenced_type" : "type-558",
+   "self_type" : "type-559",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -11665,8 +11720,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-1057",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1008",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -11674,8 +11729,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-1079",
-   "self_type" : "type-1081",
+   "referenced_type" : "type-1028",
+   "self_type" : "type-1030",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -11683,8 +11738,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-1086",
-   "self_type" : "type-1088",
+   "referenced_type" : "type-1035",
+   "self_type" : "type-1039",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -11692,8 +11747,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-1143",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-1092",
+   "self_type" : "type-1094",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11701,8 +11756,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1157",
+   "referenced_type" : "type-1104",
+   "self_type" : "type-1106",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -11710,17 +11765,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-116",
-   "self_type" : "type-118",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Parcel *",
-   "name" : "const android::Parcel *",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1165",
+   "referenced_type" : "type-1112",
+   "self_type" : "type-1114",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -11728,17 +11774,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-125",
-   "self_type" : "type-127",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Parcel *",
-   "name" : "const android::Parcel *",
-   "referenced_type" : "type-1361",
-   "self_type" : "type-1363",
+   "referenced_type" : "type-1137",
+   "self_type" : "type-1139",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -11746,8 +11783,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1160",
+   "self_type" : "type-1162",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -11755,8 +11792,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-1390",
-   "self_type" : "type-1392",
+   "referenced_type" : "type-1168",
+   "self_type" : "type-1170",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
   },
@@ -11764,8 +11801,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-1447",
-   "self_type" : "type-1449",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1231",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -11773,8 +11810,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-1459",
-   "self_type" : "type-1461",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1245",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -11782,8 +11819,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-1467",
-   "self_type" : "type-1469",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1254",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -11791,35 +11828,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-197",
-   "self_type" : "type-199",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Parcel *",
-   "name" : "const android::Parcel *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-213",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Parcel *",
-   "name" : "const android::Parcel *",
-   "referenced_type" : "type-221",
-   "self_type" : "type-224",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Parcel *",
-   "name" : "const android::Parcel *",
-   "referenced_type" : "type-841",
-   "self_type" : "type-843",
+   "referenced_type" : "type-489",
+   "self_type" : "type-491",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -11827,8 +11837,53 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
-   "referenced_type" : "type-89",
-   "self_type" : "type-91",
+   "referenced_type" : "type-511",
+   "self_type" : "type-513",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Parcel *",
+   "name" : "const android::Parcel *",
+   "referenced_type" : "type-518",
+   "self_type" : "type-522",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Parcel *",
+   "name" : "const android::Parcel *",
+   "referenced_type" : "type-575",
+   "self_type" : "type-577",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Parcel *",
+   "name" : "const android::Parcel *",
+   "referenced_type" : "type-587",
+   "self_type" : "type-589",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Parcel *",
+   "name" : "const android::Parcel *",
+   "referenced_type" : "type-595",
+   "self_type" : "type-597",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Parcel *",
+   "name" : "const android::Parcel *",
+   "referenced_type" : "type-790",
+   "self_type" : "type-792",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -11836,8 +11891,8 @@
    "alignment" : 8,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-331",
-   "self_type" : "type-330",
+   "referenced_type" : "type-208",
+   "self_type" : "type-207",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -11845,8 +11900,8 @@
    "alignment" : 8,
    "linker_set_key" : "const flowgraph::AudioFloatBlockPort *",
    "name" : "const flowgraph::AudioFloatBlockPort *",
-   "referenced_type" : "type-225",
-   "self_type" : "type-226",
+   "referenced_type" : "type-81",
+   "self_type" : "type-82",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/AudioProcessorBase.h"
   },
@@ -11854,8 +11909,8 @@
    "alignment" : 8,
    "linker_set_key" : "const flowgraph::AudioPort *",
    "name" : "const flowgraph::AudioPort *",
-   "referenced_type" : "type-202",
-   "self_type" : "type-208",
+   "referenced_type" : "type-76",
+   "self_type" : "type-77",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/AudioProcessorBase.h"
   },
@@ -11863,8 +11918,8 @@
    "alignment" : 8,
    "linker_set_key" : "const flowgraph::ClipToRange *",
    "name" : "const flowgraph::ClipToRange *",
-   "referenced_type" : "type-241",
-   "self_type" : "type-242",
+   "referenced_type" : "type-97",
+   "self_type" : "type-98",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/ClipToRange.h"
   },
@@ -11872,8 +11927,8 @@
    "alignment" : 8,
    "linker_set_key" : "const flowgraph::RampLinear *",
    "name" : "const flowgraph::RampLinear *",
-   "referenced_type" : "type-247",
-   "self_type" : "type-248",
+   "referenced_type" : "type-103",
+   "self_type" : "type-104",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/RampLinear.h"
   },
@@ -11881,8 +11936,8 @@
    "alignment" : 8,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-234",
-   "self_type" : "type-233",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -11891,7 +11946,7 @@
    "linker_set_key" : "float *",
    "name" : "float *",
    "referenced_type" : "type-27",
-   "self_type" : "type-215",
+   "self_type" : "type-79",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/AudioProcessorBase.h"
   },
@@ -11899,8 +11954,8 @@
    "alignment" : 8,
    "linker_set_key" : "flowgraph::AudioFloatBlockPort *",
    "name" : "flowgraph::AudioFloatBlockPort *",
-   "referenced_type" : "type-214",
-   "self_type" : "type-227",
+   "referenced_type" : "type-78",
+   "self_type" : "type-83",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/AudioProcessorBase.h"
   },
@@ -11908,8 +11963,8 @@
    "alignment" : 8,
    "linker_set_key" : "flowgraph::AudioFloatInputPort *",
    "name" : "flowgraph::AudioFloatInputPort *",
-   "referenced_type" : "type-230",
-   "self_type" : "type-231",
+   "referenced_type" : "type-86",
+   "self_type" : "type-87",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/AudioProcessorBase.h"
   },
@@ -11917,8 +11972,8 @@
    "alignment" : 8,
    "linker_set_key" : "flowgraph::AudioFloatOutputPort *",
    "name" : "flowgraph::AudioFloatOutputPort *",
-   "referenced_type" : "type-228",
-   "self_type" : "type-229",
+   "referenced_type" : "type-84",
+   "self_type" : "type-85",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/AudioProcessorBase.h"
   },
@@ -11926,8 +11981,8 @@
    "alignment" : 8,
    "linker_set_key" : "flowgraph::AudioPort *",
    "name" : "flowgraph::AudioPort *",
-   "referenced_type" : "type-177",
-   "self_type" : "type-193",
+   "referenced_type" : "type-73",
+   "self_type" : "type-75",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/AudioProcessorBase.h"
   },
@@ -11935,8 +11990,8 @@
    "alignment" : 8,
    "linker_set_key" : "flowgraph::AudioProcessorBase *",
    "name" : "flowgraph::AudioProcessorBase *",
-   "referenced_type" : "type-165",
-   "self_type" : "type-166",
+   "referenced_type" : "type-71",
+   "self_type" : "type-72",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/AudioProcessorBase.h"
   },
@@ -11944,8 +11999,8 @@
    "alignment" : 8,
    "linker_set_key" : "flowgraph::AudioSink *",
    "name" : "flowgraph::AudioSink *",
-   "referenced_type" : "type-236",
-   "self_type" : "type-237",
+   "referenced_type" : "type-92",
+   "self_type" : "type-93",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/AudioProcessorBase.h"
   },
@@ -11953,8 +12008,8 @@
    "alignment" : 8,
    "linker_set_key" : "flowgraph::AudioSource *",
    "name" : "flowgraph::AudioSource *",
-   "referenced_type" : "type-232",
-   "self_type" : "type-235",
+   "referenced_type" : "type-88",
+   "self_type" : "type-91",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/AudioProcessorBase.h"
   },
@@ -11962,8 +12017,8 @@
    "alignment" : 8,
    "linker_set_key" : "flowgraph::ClipToRange *",
    "name" : "flowgraph::ClipToRange *",
-   "referenced_type" : "type-239",
-   "self_type" : "type-240",
+   "referenced_type" : "type-95",
+   "self_type" : "type-96",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/ClipToRange.h"
   },
@@ -11971,8 +12026,8 @@
    "alignment" : 8,
    "linker_set_key" : "flowgraph::MonoToMultiConverter *",
    "name" : "flowgraph::MonoToMultiConverter *",
-   "referenced_type" : "type-243",
-   "self_type" : "type-867",
+   "referenced_type" : "type-99",
+   "self_type" : "type-816",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/MonoToMultiConverter.h"
   },
@@ -11980,8 +12035,8 @@
    "alignment" : 8,
    "linker_set_key" : "flowgraph::RampLinear *",
    "name" : "flowgraph::RampLinear *",
-   "referenced_type" : "type-244",
-   "self_type" : "type-246",
+   "referenced_type" : "type-100",
+   "self_type" : "type-102",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/RampLinear.h"
   },
@@ -11989,8 +12044,8 @@
    "alignment" : 8,
    "linker_set_key" : "flowgraph::SinkFloat *",
    "name" : "flowgraph::SinkFloat *",
-   "referenced_type" : "type-449",
-   "self_type" : "type-869",
+   "referenced_type" : "type-263",
+   "self_type" : "type-818",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/SinkFloat.h"
   },
@@ -11998,8 +12053,8 @@
    "alignment" : 8,
    "linker_set_key" : "flowgraph::SinkI16 *",
    "name" : "flowgraph::SinkI16 *",
-   "referenced_type" : "type-450",
-   "self_type" : "type-870",
+   "referenced_type" : "type-264",
+   "self_type" : "type-819",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/SinkI16.h"
   },
@@ -12007,8 +12062,8 @@
    "alignment" : 8,
    "linker_set_key" : "flowgraph::SinkI24 *",
    "name" : "flowgraph::SinkI24 *",
-   "referenced_type" : "type-451",
-   "self_type" : "type-872",
+   "referenced_type" : "type-265",
+   "self_type" : "type-821",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/SinkI24.h"
   },
@@ -12016,8 +12071,8 @@
    "alignment" : 8,
    "linker_set_key" : "flowgraph::SourceFloat *",
    "name" : "flowgraph::SourceFloat *",
-   "referenced_type" : "type-452",
-   "self_type" : "type-1175",
+   "referenced_type" : "type-266",
+   "self_type" : "type-1268",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/SourceFloat.h"
   },
@@ -12025,8 +12080,8 @@
    "alignment" : 8,
    "linker_set_key" : "flowgraph::SourceI16 *",
    "name" : "flowgraph::SourceI16 *",
-   "referenced_type" : "type-453",
-   "self_type" : "type-1176",
+   "referenced_type" : "type-267",
+   "self_type" : "type-1271",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/SourceI16.h"
   },
@@ -12034,8 +12089,8 @@
    "alignment" : 8,
    "linker_set_key" : "flowgraph::SourceI24 *",
    "name" : "flowgraph::SourceI24 *",
-   "referenced_type" : "type-454",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-268",
+   "self_type" : "type-1272",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/SourceI24.h"
   },
@@ -12053,7 +12108,7 @@
    "linker_set_key" : "int *",
    "name" : "int *",
    "referenced_type" : "type-4",
-   "self_type" : "type-368",
+   "self_type" : "type-245",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -12070,8 +12125,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::atomic<long> *",
    "name" : "std::atomic<long> *",
-   "referenced_type" : "type-1299",
-   "self_type" : "type-1298",
+   "referenced_type" : "type-1434",
+   "self_type" : "type-1433",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/fifo/FifoControllerIndirect.h"
   },
@@ -12079,8 +12134,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::atomic<long> *",
    "name" : "std::atomic<long> *",
-   "referenced_type" : "type-438",
-   "self_type" : "type-437",
+   "referenced_type" : "type-251",
+   "self_type" : "type-250",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/fifo/FifoControllerIndirect.h"
   },
@@ -12088,8 +12143,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::atomic<long> *",
    "name" : "std::atomic<long> *",
-   "referenced_type" : "type-629",
-   "self_type" : "type-628",
+   "referenced_type" : "type-426",
+   "self_type" : "type-425",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/fifo/FifoControllerIndirect.h"
   },
@@ -12097,8 +12152,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::atomic<long> *",
    "name" : "std::atomic<long> *",
-   "referenced_type" : "type-779",
-   "self_type" : "type-778",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/fifo/FifoControllerIndirect.h"
   },
@@ -12106,8 +12161,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::atomic<long> *",
    "name" : "std::atomic<long> *",
-   "referenced_type" : "type-995",
-   "self_type" : "type-994",
+   "referenced_type" : "type-944",
+   "self_type" : "type-943",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/fifo/FifoControllerIndirect.h"
   },
@@ -12133,8 +12188,8 @@
    "alignment" : 8,
    "linker_set_key" : "void (*)(int, void *, void *)",
    "name" : "void (*)(int, void *, void *)",
-   "referenced_type" : "type-351",
-   "self_type" : "type-350",
+   "referenced_type" : "type-228",
+   "self_type" : "type-227",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -12161,7 +12216,7 @@
    "linker_set_key" : "void **",
    "name" : "void **",
    "referenced_type" : "type-53",
-   "self_type" : "type-376",
+   "self_type" : "type-253",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   }
@@ -12173,8 +12228,8 @@
    "is_const" : true,
    "linker_set_key" : "const MonotonicCounter",
    "name" : "const MonotonicCounter",
-   "referenced_type" : "type-223",
-   "self_type" : "type-258",
+   "referenced_type" : "type-80",
+   "self_type" : "type-121",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/MonotonicCounter.h"
   },
@@ -12184,7 +12239,7 @@
    "linker_set_key" : "const SimpleDoubleBuffer<Timestamp>",
    "name" : "const SimpleDoubleBuffer<Timestamp>",
    "referenced_type" : "type-20",
-   "self_type" : "type-467",
+   "self_type" : "type-449",
    "size" : 40,
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/AAudioUtilities.h"
   },
@@ -12194,7 +12249,7 @@
    "linker_set_key" : "const Timestamp",
    "name" : "const Timestamp",
    "referenced_type" : "type-22",
-   "self_type" : "type-401",
+   "self_type" : "type-274",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/AAudioUtilities.h"
   },
@@ -12203,8 +12258,8 @@
    "is_const" : true,
    "linker_set_key" : "const aaudio::AAudioStreamConfiguration",
    "name" : "const aaudio::AAudioStreamConfiguration",
-   "referenced_type" : "type-104",
-   "self_type" : "type-122",
+   "referenced_type" : "type-149",
+   "self_type" : "type-158",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -12223,8 +12278,8 @@
    "is_const" : true,
    "linker_set_key" : "const aaudio::AAudioStreamRequest",
    "name" : "const aaudio::AAudioStreamRequest",
-   "referenced_type" : "type-103",
-   "self_type" : "type-102",
+   "referenced_type" : "type-152",
+   "self_type" : "type-154",
    "size" : 88,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
   },
@@ -12234,7 +12289,7 @@
    "linker_set_key" : "const aaudio::AudioEndpoint",
    "name" : "const aaudio::AudioEndpoint",
    "referenced_type" : "type-10",
-   "self_type" : "type-432",
+   "self_type" : "type-277",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioEndpoint.h"
   },
@@ -12244,7 +12299,7 @@
    "linker_set_key" : "const aaudio::AudioEndpointParcelable",
    "name" : "const aaudio::AudioEndpointParcelable",
    "referenced_type" : "type-28",
-   "self_type" : "type-85",
+   "self_type" : "type-485",
    "size" : 1168,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -12254,7 +12309,7 @@
    "linker_set_key" : "const aaudio::AudioStream",
    "name" : "const aaudio::AudioStream",
    "referenced_type" : "type-42",
-   "self_type" : "type-364",
+   "self_type" : "type-241",
    "size" : 208,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -12262,16 +12317,8 @@
    "is_const" : true,
    "linker_set_key" : "const aaudio::AudioStreamBuilder",
    "name" : "const aaudio::AudioStreamBuilder",
-   "referenced_type" : "type-1041",
-   "self_type" : "type-1040",
-   "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const aaudio::AudioStreamBuilder",
-   "name" : "const aaudio::AudioStreamBuilder",
-   "referenced_type" : "type-1345",
-   "self_type" : "type-1344",
+   "referenced_type" : "type-1123",
+   "self_type" : "type-1122",
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
   {
@@ -12279,8 +12326,8 @@
    "is_const" : true,
    "linker_set_key" : "const aaudio::AudioStreamBuilder",
    "name" : "const aaudio::AudioStreamBuilder",
-   "referenced_type" : "type-370",
-   "self_type" : "type-369",
+   "referenced_type" : "type-247",
+   "self_type" : "type-246",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -12288,16 +12335,24 @@
    "is_const" : true,
    "linker_set_key" : "const aaudio::AudioStreamBuilder",
    "name" : "const aaudio::AudioStreamBuilder",
-   "referenced_type" : "type-76",
-   "self_type" : "type-75",
+   "referenced_type" : "type-473",
+   "self_type" : "type-472",
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const aaudio::AudioStreamBuilder",
    "name" : "const aaudio::AudioStreamBuilder",
-   "referenced_type" : "type-825",
-   "self_type" : "type-824",
+   "referenced_type" : "type-774",
+   "self_type" : "type-773",
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const aaudio::AudioStreamBuilder",
+   "name" : "const aaudio::AudioStreamBuilder",
+   "referenced_type" : "type-990",
+   "self_type" : "type-989",
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
   {
@@ -12306,8 +12361,8 @@
    "linker_set_key" : "const aaudio::AudioStreamInternal",
    "name" : "const aaudio::AudioStreamInternal",
    "referenced_type" : "type-6",
-   "self_type" : "type-120",
-   "size" : 1712,
+   "self_type" : "type-64",
+   "size" : 1720,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
   {
@@ -12315,9 +12370,9 @@
    "is_const" : true,
    "linker_set_key" : "const aaudio::AudioStreamInternalCapture",
    "name" : "const aaudio::AudioStreamInternalCapture",
-   "referenced_type" : "type-139",
-   "self_type" : "type-154",
-   "size" : 1720,
+   "referenced_type" : "type-67",
+   "self_type" : "type-69",
+   "size" : 1728,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalCapture.h"
   },
   {
@@ -12325,9 +12380,9 @@
    "is_const" : true,
    "linker_set_key" : "const aaudio::AudioStreamInternalPlay",
    "name" : "const aaudio::AudioStreamInternalPlay",
-   "referenced_type" : "type-68",
-   "self_type" : "type-250",
-   "size" : 1760,
+   "referenced_type" : "type-111",
+   "self_type" : "type-113",
+   "size" : 1768,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
   {
@@ -12335,8 +12390,8 @@
    "is_const" : true,
    "linker_set_key" : "const aaudio::AudioStreamRecord",
    "name" : "const aaudio::AudioStreamRecord",
-   "referenced_type" : "type-270",
-   "self_type" : "type-275",
+   "referenced_type" : "type-133",
+   "self_type" : "type-138",
    "size" : 392,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamRecord.h"
   },
@@ -12345,8 +12400,8 @@
    "is_const" : true,
    "linker_set_key" : "const aaudio::AudioStreamTrack",
    "name" : "const aaudio::AudioStreamTrack",
-   "referenced_type" : "type-280",
-   "self_type" : "type-282",
+   "referenced_type" : "type-143",
+   "self_type" : "type-145",
    "size" : 368,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamTrack.h"
   },
@@ -12356,7 +12411,7 @@
    "linker_set_key" : "const aaudio::EndpointDescriptor_s",
    "name" : "const aaudio::EndpointDescriptor_s",
    "referenced_type" : "type-39",
-   "self_type" : "type-458",
+   "self_type" : "type-437",
    "size" : 120,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioEndpoint.h"
   },
@@ -12366,8 +12421,8 @@
    "linker_set_key" : "const aaudio::IsochronousClockModel",
    "name" : "const aaudio::IsochronousClockModel",
    "referenced_type" : "type-7",
-   "self_type" : "type-314",
-   "size" : 40,
+   "self_type" : "type-191",
+   "size" : 48,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
   },
   {
@@ -12376,7 +12431,7 @@
    "linker_set_key" : "const aaudio::RingBufferParcelable",
    "name" : "const aaudio::RingBufferParcelable",
    "referenced_type" : "type-29",
-   "self_type" : "type-192",
+   "self_type" : "type-571",
    "size" : 96,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
   },
@@ -12386,7 +12441,7 @@
    "linker_set_key" : "const aaudio::SharedMemoryParcelable",
    "name" : "const aaudio::SharedMemoryParcelable",
    "referenced_type" : "type-35",
-   "self_type" : "type-206",
+   "self_type" : "type-583",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -12396,7 +12451,7 @@
    "linker_set_key" : "const aaudio::SharedRegionParcelable",
    "name" : "const aaudio::SharedRegionParcelable",
    "referenced_type" : "type-30",
-   "self_type" : "type-217",
+   "self_type" : "type-591",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
   },
@@ -12405,8 +12460,68 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1020",
+   "self_type" : "type-1019",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::AudioClient",
+   "name" : "const android::AudioClient",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1063",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::AudioClient",
+   "name" : "const android::AudioClient",
+   "referenced_type" : "type-1153",
+   "self_type" : "type-1152",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::AudioClient",
+   "name" : "const android::AudioClient",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1196",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::AudioClient",
+   "name" : "const android::AudioClient",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1311",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::AudioClient",
+   "name" : "const android::AudioClient",
+   "referenced_type" : "type-1391",
+   "self_type" : "type-1390",
+   "size" : 32,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::AudioClient",
+   "name" : "const android::AudioClient",
+   "referenced_type" : "type-1450",
+   "self_type" : "type-1449",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
@@ -12415,8 +12530,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-1071",
-   "self_type" : "type-1070",
+   "referenced_type" : "type-182",
+   "self_type" : "type-181",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -12425,8 +12540,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-109",
-   "self_type" : "type-108",
+   "referenced_type" : "type-368",
+   "self_type" : "type-367",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -12435,28 +12550,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-1115",
-   "self_type" : "type-1114",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::AudioClient",
-   "name" : "const android::AudioClient",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1240",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::AudioClient",
-   "name" : "const android::AudioClient",
-   "referenced_type" : "type-1316",
-   "self_type" : "type-1315",
+   "referenced_type" : "type-443",
+   "self_type" : "type-442",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
@@ -12465,8 +12560,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-1375",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-503",
+   "self_type" : "type-502",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -12475,8 +12570,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1418",
+   "referenced_type" : "type-547",
+   "self_type" : "type-546",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -12485,8 +12580,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-159",
-   "self_type" : "type-158",
+   "referenced_type" : "type-670",
+   "self_type" : "type-669",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -12495,28 +12590,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-305",
-   "self_type" : "type-304",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::AudioClient",
-   "name" : "const android::AudioClient",
-   "referenced_type" : "type-395",
-   "self_type" : "type-394",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::AudioClient",
-   "name" : "const android::AudioClient",
-   "referenced_type" : "type-462",
-   "self_type" : "type-461",
+   "referenced_type" : "type-745",
+   "self_type" : "type-744",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
@@ -12525,8 +12600,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-571",
-   "self_type" : "type-570",
+   "referenced_type" : "type-804",
+   "self_type" : "type-803",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -12535,8 +12610,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-721",
-   "self_type" : "type-720",
+   "referenced_type" : "type-886",
+   "self_type" : "type-885",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -12545,38 +12620,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::AudioClient",
    "name" : "const android::AudioClient",
-   "referenced_type" : "type-796",
-   "self_type" : "type-795",
+   "referenced_type" : "type-961",
+   "self_type" : "type-960",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::AudioClient",
-   "name" : "const android::AudioClient",
-   "referenced_type" : "type-855",
-   "self_type" : "type-854",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::AudioClient",
-   "name" : "const android::AudioClient",
-   "referenced_type" : "type-937",
-   "self_type" : "type-936",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "const android::FifoControllerBase",
    "name" : "const android::FifoControllerBase",
-   "referenced_type" : "type-324",
-   "self_type" : "type-325",
+   "referenced_type" : "type-201",
+   "self_type" : "type-202",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libaaudio/src/fifo/FifoControllerBase.h"
   },
@@ -12585,8 +12640,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IAAudioClient",
    "name" : "const android::IAAudioClient",
-   "referenced_type" : "type-137",
-   "self_type" : "type-136",
+   "referenced_type" : "type-160",
+   "self_type" : "type-529",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12595,8 +12650,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IAAudioService",
    "name" : "const android::IAAudioService",
-   "referenced_type" : "type-174",
-   "self_type" : "type-173",
+   "referenced_type" : "type-167",
+   "self_type" : "type-558",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -12605,8 +12660,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-1058",
-   "self_type" : "type-1057",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1006",
    "size" : 120,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -12615,258 +12670,248 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-1080",
-   "self_type" : "type-1079",
-   "size" : 120,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Parcel",
-   "name" : "const android::Parcel",
-   "referenced_type" : "type-1087",
-   "self_type" : "type-1086",
-   "size" : 120,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Parcel",
-   "name" : "const android::Parcel",
-   "referenced_type" : "type-1107",
-   "self_type" : "type-1106",
-   "size" : 120,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Parcel",
-   "name" : "const android::Parcel",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1133",
-   "size" : 120,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Parcel",
-   "name" : "const android::Parcel",
-   "referenced_type" : "type-1144",
-   "self_type" : "type-1143",
-   "size" : 120,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Parcel",
-   "name" : "const android::Parcel",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1155",
-   "size" : 120,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Parcel",
-   "name" : "const android::Parcel",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1163",
-   "size" : 120,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Parcel",
-   "name" : "const android::Parcel",
-   "referenced_type" : "type-117",
-   "self_type" : "type-116",
-   "size" : 120,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Parcel",
-   "name" : "const android::Parcel",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
-   "size" : 120,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Parcel",
-   "name" : "const android::Parcel",
-   "referenced_type" : "type-1362",
-   "self_type" : "type-1361",
-   "size" : 120,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Parcel",
-   "name" : "const android::Parcel",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1383",
-   "size" : 120,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Parcel",
-   "name" : "const android::Parcel",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1390",
-   "size" : 120,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Parcel",
-   "name" : "const android::Parcel",
-   "referenced_type" : "type-1411",
-   "self_type" : "type-1410",
-   "size" : 120,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Parcel",
-   "name" : "const android::Parcel",
-   "referenced_type" : "type-1438",
-   "self_type" : "type-1437",
-   "size" : 120,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Parcel",
-   "name" : "const android::Parcel",
-   "referenced_type" : "type-1448",
-   "self_type" : "type-1447",
-   "size" : 120,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Parcel",
-   "name" : "const android::Parcel",
-   "referenced_type" : "type-1460",
-   "self_type" : "type-1459",
-   "size" : 120,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Parcel",
-   "name" : "const android::Parcel",
-   "referenced_type" : "type-1468",
-   "self_type" : "type-1467",
-   "size" : 120,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Parcel",
-   "name" : "const android::Parcel",
-   "referenced_type" : "type-149",
-   "self_type" : "type-148",
-   "size" : 120,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Parcel",
-   "name" : "const android::Parcel",
-   "referenced_type" : "type-187",
-   "self_type" : "type-186",
-   "size" : 120,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Parcel",
-   "name" : "const android::Parcel",
-   "referenced_type" : "type-198",
-   "self_type" : "type-197",
-   "size" : 120,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Parcel",
-   "name" : "const android::Parcel",
-   "referenced_type" : "type-212",
-   "self_type" : "type-211",
-   "size" : 120,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Parcel",
-   "name" : "const android::Parcel",
-   "referenced_type" : "type-222",
-   "self_type" : "type-221",
-   "size" : 120,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Parcel",
-   "name" : "const android::Parcel",
-   "referenced_type" : "type-842",
-   "self_type" : "type-841",
-   "size" : 120,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Parcel",
-   "name" : "const android::Parcel",
-   "referenced_type" : "type-90",
-   "self_type" : "type-89",
-   "size" : 120,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::String16",
-   "name" : "const android::String16",
-   "referenced_type" : "type-1021",
-   "self_type" : "type-1020",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::String16",
-   "name" : "const android::String16",
    "referenced_type" : "type-1029",
    "self_type" : "type-1028",
+   "size" : 120,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel",
+   "name" : "const android::Parcel",
+   "referenced_type" : "type-1036",
+   "self_type" : "type-1035",
+   "size" : 120,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel",
+   "name" : "const android::Parcel",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1055",
+   "size" : 120,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel",
+   "name" : "const android::Parcel",
+   "referenced_type" : "type-1083",
+   "self_type" : "type-1082",
+   "size" : 120,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel",
+   "name" : "const android::Parcel",
+   "referenced_type" : "type-1093",
+   "self_type" : "type-1092",
+   "size" : 120,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel",
+   "name" : "const android::Parcel",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1104",
+   "size" : 120,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel",
+   "name" : "const android::Parcel",
+   "referenced_type" : "type-1113",
+   "self_type" : "type-1112",
+   "size" : 120,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel",
+   "name" : "const android::Parcel",
+   "referenced_type" : "type-1138",
+   "self_type" : "type-1137",
+   "size" : 120,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel",
+   "name" : "const android::Parcel",
+   "referenced_type" : "type-1161",
+   "self_type" : "type-1160",
+   "size" : 120,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel",
+   "name" : "const android::Parcel",
+   "referenced_type" : "type-1169",
+   "self_type" : "type-1168",
+   "size" : 120,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel",
+   "name" : "const android::Parcel",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1186",
+   "size" : 120,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel",
+   "name" : "const android::Parcel",
+   "referenced_type" : "type-1218",
+   "self_type" : "type-1217",
+   "size" : 120,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel",
+   "name" : "const android::Parcel",
+   "referenced_type" : "type-1230",
+   "self_type" : "type-1229",
+   "size" : 120,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel",
+   "name" : "const android::Parcel",
+   "referenced_type" : "type-1244",
+   "self_type" : "type-1243",
+   "size" : 120,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel",
+   "name" : "const android::Parcel",
+   "referenced_type" : "type-1252",
+   "self_type" : "type-1251",
+   "size" : 120,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel",
+   "name" : "const android::Parcel",
+   "referenced_type" : "type-490",
+   "self_type" : "type-489",
+   "size" : 120,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel",
+   "name" : "const android::Parcel",
+   "referenced_type" : "type-512",
+   "self_type" : "type-511",
+   "size" : 120,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel",
+   "name" : "const android::Parcel",
+   "referenced_type" : "type-519",
+   "self_type" : "type-518",
+   "size" : 120,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel",
+   "name" : "const android::Parcel",
+   "referenced_type" : "type-539",
+   "self_type" : "type-538",
+   "size" : 120,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel",
+   "name" : "const android::Parcel",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
+   "size" : 120,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel",
+   "name" : "const android::Parcel",
+   "referenced_type" : "type-576",
+   "self_type" : "type-575",
+   "size" : 120,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/RingBufferParcelable.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel",
+   "name" : "const android::Parcel",
+   "referenced_type" : "type-588",
+   "self_type" : "type-587",
+   "size" : 120,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel",
+   "name" : "const android::Parcel",
+   "referenced_type" : "type-596",
+   "self_type" : "type-595",
+   "size" : 120,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedRegionParcelable.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel",
+   "name" : "const android::Parcel",
+   "referenced_type" : "type-791",
+   "self_type" : "type-790",
+   "size" : 120,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::String16",
+   "name" : "const android::String16",
+   "referenced_type" : "type-1011",
+   "self_type" : "type-1010",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12875,8 +12920,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1045",
-   "self_type" : "type-1044",
+   "referenced_type" : "type-1041",
+   "self_type" : "type-1040",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12885,8 +12930,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1062",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1069",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12895,8 +12940,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1092",
-   "self_type" : "type-1091",
+   "referenced_type" : "type-1127",
+   "self_type" : "type-1126",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12905,8 +12950,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1121",
-   "self_type" : "type-1120",
+   "referenced_type" : "type-1144",
+   "self_type" : "type-1143",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12915,8 +12960,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1234",
-   "self_type" : "type-1233",
+   "referenced_type" : "type-1174",
+   "self_type" : "type-1173",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12925,8 +12970,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1268",
-   "self_type" : "type-1267",
+   "referenced_type" : "type-1205",
+   "self_type" : "type-1204",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12935,8 +12980,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-131",
-   "self_type" : "type-130",
+   "referenced_type" : "type-1305",
+   "self_type" : "type-1304",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12945,8 +12990,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1325",
-   "self_type" : "type-1324",
+   "referenced_type" : "type-1339",
+   "self_type" : "type-1338",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12955,8 +13000,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1333",
-   "self_type" : "type-1332",
+   "referenced_type" : "type-1386",
+   "self_type" : "type-1385",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12965,8 +13010,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1349",
-   "self_type" : "type-1348",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1407",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12975,8 +13020,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1366",
-   "self_type" : "type-1365",
+   "referenced_type" : "type-1457",
+   "self_type" : "type-1456",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12985,8 +13030,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1396",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1464",
+   "self_type" : "type-1463",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -12995,8 +13040,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-163",
+   "self_type" : "type-162",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13005,8 +13050,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-168",
-   "self_type" : "type-167",
+   "referenced_type" : "type-219",
+   "self_type" : "type-218",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13015,8 +13060,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-292",
-   "self_type" : "type-291",
+   "referenced_type" : "type-361",
+   "self_type" : "type-360",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13025,8 +13070,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-342",
-   "self_type" : "type-341",
+   "referenced_type" : "type-395",
+   "self_type" : "type-394",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13035,8 +13080,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-389",
-   "self_type" : "type-388",
+   "referenced_type" : "type-453",
+   "self_type" : "type-452",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13045,18 +13090,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-412",
-   "self_type" : "type-411",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::String16",
-   "name" : "const android::String16",
-   "referenced_type" : "type-470",
-   "self_type" : "type-469",
+   "referenced_type" : "type-461",
+   "self_type" : "type-460",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13075,8 +13110,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-564",
-   "self_type" : "type-563",
+   "referenced_type" : "type-494",
+   "self_type" : "type-493",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13085,8 +13120,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
+   "referenced_type" : "type-524",
+   "self_type" : "type-523",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13095,8 +13130,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-714",
-   "self_type" : "type-713",
+   "referenced_type" : "type-553",
+   "self_type" : "type-552",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13105,8 +13140,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-748",
-   "self_type" : "type-747",
+   "referenced_type" : "type-663",
+   "self_type" : "type-662",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13115,8 +13150,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-79",
-   "self_type" : "type-78",
+   "referenced_type" : "type-697",
+   "self_type" : "type-696",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13125,8 +13160,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-805",
-   "self_type" : "type-804",
+   "referenced_type" : "type-754",
+   "self_type" : "type-753",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13135,8 +13170,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-813",
-   "self_type" : "type-812",
+   "referenced_type" : "type-762",
+   "self_type" : "type-761",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13145,8 +13180,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-829",
-   "self_type" : "type-828",
+   "referenced_type" : "type-778",
+   "self_type" : "type-777",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13155,8 +13190,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-846",
-   "self_type" : "type-845",
+   "referenced_type" : "type-795",
+   "self_type" : "type-794",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13165,8 +13200,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-930",
-   "self_type" : "type-929",
+   "referenced_type" : "type-879",
+   "self_type" : "type-878",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13175,8 +13210,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-95",
-   "self_type" : "type-94",
+   "referenced_type" : "type-913",
+   "self_type" : "type-912",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13185,8 +13220,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-964",
-   "self_type" : "type-963",
+   "referenced_type" : "type-970",
+   "self_type" : "type-969",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::String16",
+   "name" : "const android::String16",
+   "referenced_type" : "type-978",
+   "self_type" : "type-977",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::String16",
+   "name" : "const android::String16",
+   "referenced_type" : "type-994",
+   "self_type" : "type-993",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -13195,8 +13250,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1050",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-999",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -13205,8 +13260,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-1149",
-   "self_type" : "type-1148",
+   "referenced_type" : "type-1098",
+   "self_type" : "type-1097",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -13215,8 +13270,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-1355",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-1131",
+   "self_type" : "type-1130",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -13225,8 +13280,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1452",
+   "referenced_type" : "type-1236",
+   "self_type" : "type-1235",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -13235,8 +13290,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-204",
-   "self_type" : "type-203",
+   "referenced_type" : "type-483",
+   "self_type" : "type-482",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
+   "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
+   "referenced_type" : "type-581",
+   "self_type" : "type-580",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/SharedMemoryParcelable.h"
   },
@@ -13245,18 +13310,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-835",
-   "self_type" : "type-834",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-83",
-   "self_type" : "type-82",
+   "referenced_type" : "type-784",
+   "self_type" : "type-783",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AudioEndpointParcelable.h"
   },
@@ -13265,8 +13320,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-1038",
+   "self_type" : "type-1037",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13275,8 +13330,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-1118",
+   "self_type" : "type-1117",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13285,8 +13340,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-1036",
-   "self_type" : "type-1035",
+   "referenced_type" : "type-1315",
+   "self_type" : "type-1314",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13295,8 +13350,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-1090",
-   "self_type" : "type-1089",
+   "referenced_type" : "type-1336",
+   "self_type" : "type-1335",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13305,8 +13360,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-1244",
-   "self_type" : "type-1243",
+   "referenced_type" : "type-1342",
+   "self_type" : "type-1341",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13315,8 +13370,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-1265",
-   "self_type" : "type-1264",
+   "referenced_type" : "type-1352",
+   "self_type" : "type-1351",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13325,8 +13380,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-1271",
-   "self_type" : "type-1270",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1358",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13335,8 +13390,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-1281",
-   "self_type" : "type-1280",
+   "referenced_type" : "type-1369",
+   "self_type" : "type-1368",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13345,8 +13400,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1287",
+   "referenced_type" : "type-1375",
+   "self_type" : "type-1374",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13355,8 +13410,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-1328",
-   "self_type" : "type-1327",
+   "referenced_type" : "type-1405",
+   "self_type" : "type-1404",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13365,8 +13420,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1334",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1409",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13375,8 +13430,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-1340",
-   "self_type" : "type-1339",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1418",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13385,8 +13440,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-1394",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1425",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13395,8 +13450,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-339",
-   "self_type" : "type-338",
+   "referenced_type" : "type-1441",
+   "self_type" : "type-1440",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13405,8 +13460,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-345",
-   "self_type" : "type-344",
+   "referenced_type" : "type-1459",
+   "self_type" : "type-1458",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13415,8 +13470,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-355",
-   "self_type" : "type-354",
+   "referenced_type" : "type-1467",
+   "self_type" : "type-1466",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13425,8 +13480,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-361",
-   "self_type" : "type-360",
+   "referenced_type" : "type-216",
+   "self_type" : "type-215",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13435,8 +13490,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-372",
-   "self_type" : "type-371",
+   "referenced_type" : "type-222",
+   "self_type" : "type-221",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13445,8 +13500,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-378",
-   "self_type" : "type-377",
+   "referenced_type" : "type-232",
+   "self_type" : "type-231",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13455,8 +13510,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-409",
-   "self_type" : "type-408",
+   "referenced_type" : "type-238",
+   "self_type" : "type-237",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13465,8 +13520,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-414",
-   "self_type" : "type-413",
+   "referenced_type" : "type-280",
+   "self_type" : "type-279",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13475,8 +13530,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-423",
-   "self_type" : "type-422",
+   "referenced_type" : "type-371",
+   "self_type" : "type-370",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13485,8 +13540,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-429",
-   "self_type" : "type-428",
+   "referenced_type" : "type-392",
+   "self_type" : "type-391",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13495,8 +13550,58 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-447",
-   "self_type" : "type-446",
+   "referenced_type" : "type-398",
+   "self_type" : "type-397",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
+   "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
+   "referenced_type" : "type-408",
+   "self_type" : "type-407",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
+   "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
+   "referenced_type" : "type-415",
+   "self_type" : "type-414",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
+   "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
+   "referenced_type" : "type-456",
+   "self_type" : "type-455",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
+   "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
+   "referenced_type" : "type-463",
+   "self_type" : "type-462",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
+   "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
+   "referenced_type" : "type-468",
+   "self_type" : "type-467",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13515,8 +13620,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-472",
-   "self_type" : "type-471",
+   "referenced_type" : "type-521",
+   "self_type" : "type-520",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13525,8 +13630,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-479",
-   "self_type" : "type-478",
+   "referenced_type" : "type-673",
+   "self_type" : "type-672",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13535,8 +13640,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-574",
-   "self_type" : "type-573",
+   "referenced_type" : "type-694",
+   "self_type" : "type-693",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13545,8 +13650,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
+   "referenced_type" : "type-700",
+   "self_type" : "type-699",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13555,8 +13660,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-601",
-   "self_type" : "type-600",
+   "referenced_type" : "type-710",
+   "self_type" : "type-709",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13565,8 +13670,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-611",
-   "self_type" : "type-610",
+   "referenced_type" : "type-717",
+   "self_type" : "type-716",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13575,8 +13680,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-618",
-   "self_type" : "type-617",
+   "referenced_type" : "type-757",
+   "self_type" : "type-756",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13585,8 +13690,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-64",
-   "self_type" : "type-63",
+   "referenced_type" : "type-764",
+   "self_type" : "type-763",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13595,8 +13700,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-649",
+   "referenced_type" : "type-769",
+   "self_type" : "type-768",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13605,8 +13710,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-724",
-   "self_type" : "type-723",
+   "referenced_type" : "type-811",
+   "self_type" : "type-810",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13615,8 +13720,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-745",
-   "self_type" : "type-744",
+   "referenced_type" : "type-889",
+   "self_type" : "type-888",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13625,8 +13730,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-751",
-   "self_type" : "type-750",
+   "referenced_type" : "type-910",
+   "self_type" : "type-909",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13635,8 +13740,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-761",
-   "self_type" : "type-760",
+   "referenced_type" : "type-916",
+   "self_type" : "type-915",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13645,8 +13750,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-768",
-   "self_type" : "type-767",
+   "referenced_type" : "type-926",
+   "self_type" : "type-925",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13655,8 +13760,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-808",
-   "self_type" : "type-807",
+   "referenced_type" : "type-933",
+   "self_type" : "type-932",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13665,8 +13770,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-815",
-   "self_type" : "type-814",
+   "referenced_type" : "type-973",
+   "self_type" : "type-972",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13675,8 +13780,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-820",
-   "self_type" : "type-819",
+   "referenced_type" : "type-980",
+   "self_type" : "type-979",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13685,58 +13790,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
    "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-862",
-   "self_type" : "type-861",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-940",
-   "self_type" : "type-939",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-961",
-   "self_type" : "type-960",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-967",
-   "self_type" : "type-966",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-977",
-   "self_type" : "type-976",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "name" : "const android::sp<aaudio::AudioStream::MyPlayerBase>",
-   "referenced_type" : "type-984",
-   "self_type" : "type-983",
+   "referenced_type" : "type-985",
+   "self_type" : "type-984",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -13745,18 +13800,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-1214",
-   "self_type" : "type-1213",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-1276",
-   "self_type" : "type-1275",
+   "referenced_type" : "type-125",
+   "self_type" : "type-124",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -13775,8 +13820,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-1293",
-   "self_type" : "type-1292",
+   "referenced_type" : "type-1347",
+   "self_type" : "type-1346",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -13785,8 +13830,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-262",
-   "self_type" : "type-261",
+   "referenced_type" : "type-1357",
+   "self_type" : "type-1356",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -13795,8 +13840,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-349",
-   "self_type" : "type-348",
+   "referenced_type" : "type-1364",
+   "self_type" : "type-1363",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -13805,8 +13850,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-359",
-   "self_type" : "type-358",
+   "referenced_type" : "type-1382",
+   "self_type" : "type-1381",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -13815,8 +13860,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-366",
-   "self_type" : "type-365",
+   "referenced_type" : "type-1415",
+   "self_type" : "type-1414",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -13825,8 +13870,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-385",
-   "self_type" : "type-384",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1423",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -13835,8 +13880,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-419",
-   "self_type" : "type-418",
+   "referenced_type" : "type-1432",
+   "self_type" : "type-1431",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -13845,8 +13890,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-427",
-   "self_type" : "type-426",
+   "referenced_type" : "type-226",
+   "self_type" : "type-225",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -13855,8 +13900,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-435",
-   "self_type" : "type-434",
+   "referenced_type" : "type-236",
+   "self_type" : "type-235",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
   },
@@ -13865,129 +13910,229 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
    "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
+   "referenced_type" : "type-243",
+   "self_type" : "type-242",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
+   "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
+   "referenced_type" : "type-341",
+   "self_type" : "type-340",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
+   "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
+   "referenced_type" : "type-403",
+   "self_type" : "type-402",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
+   "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
+   "referenced_type" : "type-413",
+   "self_type" : "type-412",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
+   "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
+   "referenced_type" : "type-420",
+   "self_type" : "type-419",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
+   "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
+   "referenced_type" : "type-643",
+   "self_type" : "type-642",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
+   "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
+   "referenced_type" : "type-705",
+   "self_type" : "type-704",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
+   "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
+   "referenced_type" : "type-715",
+   "self_type" : "type-714",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
+   "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
+   "referenced_type" : "type-722",
+   "self_type" : "type-721",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
+   "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
+   "referenced_type" : "type-859",
+   "self_type" : "type-858",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
+   "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
+   "referenced_type" : "type-921",
+   "self_type" : "type-920",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
+   "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
+   "referenced_type" : "type-931",
+   "self_type" : "type-930",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
+   "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
+   "referenced_type" : "type-938",
+   "self_type" : "type-937",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IAAudioClient>",
+   "name" : "const android::sp<android::IAAudioClient>",
+   "referenced_type" : "type-1015",
+   "self_type" : "type-1014",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IAAudioClient>",
+   "name" : "const android::sp<android::IAAudioClient>",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1060",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IAAudioClient>",
+   "name" : "const android::sp<android::IAAudioClient>",
+   "referenced_type" : "type-1148",
+   "self_type" : "type-1147",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IAAudioClient>",
+   "name" : "const android::sp<android::IAAudioClient>",
+   "referenced_type" : "type-1194",
+   "self_type" : "type-1193",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IAAudioClient>",
+   "name" : "const android::sp<android::IAAudioClient>",
+   "referenced_type" : "type-1309",
+   "self_type" : "type-1308",
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IAAudioClient>",
+   "name" : "const android::sp<android::IAAudioClient>",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1387",
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IAAudioClient>",
+   "name" : "const android::sp<android::IAAudioClient>",
+   "referenced_type" : "type-179",
+   "self_type" : "type-178",
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IAAudioClient>",
+   "name" : "const android::sp<android::IAAudioClient>",
+   "referenced_type" : "type-365",
+   "self_type" : "type-364",
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IAAudioClient>",
+   "name" : "const android::sp<android::IAAudioClient>",
+   "referenced_type" : "type-498",
+   "self_type" : "type-497",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IAAudioClient>",
+   "name" : "const android::sp<android::IAAudioClient>",
    "referenced_type" : "type-544",
    "self_type" : "type-543",
    "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-606",
-   "self_type" : "type-605",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-616",
-   "self_type" : "type-615",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-623",
-   "self_type" : "type-622",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-694",
-   "self_type" : "type-693",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-756",
-   "self_type" : "type-755",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-773",
-   "self_type" : "type-772",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-910",
-   "self_type" : "type-909",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-972",
-   "self_type" : "type-971",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-982",
-   "self_type" : "type-981",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "name" : "const android::sp<aaudio::AudioStreamLegacy::StreamDeviceCallback>",
-   "referenced_type" : "type-989",
-   "self_type" : "type-988",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h"
-  },
-  {
-   "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioClient>",
    "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-1066",
-   "self_type" : "type-1065",
-   "size" : 8,
+   "referenced_type" : "type-667",
+   "self_type" : "type-666",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
@@ -13995,8 +14140,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioClient>",
    "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-799",
+   "self_type" : "type-798",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -14004,97 +14149,17 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioClient>",
    "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-1238",
-   "self_type" : "type-1237",
+   "referenced_type" : "type-883",
+   "self_type" : "type-882",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::sp<android::IAAudioClient>",
-   "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1369",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::IAAudioClient>",
-   "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1415",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::IAAudioClient>",
-   "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-156",
-   "self_type" : "type-155",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::IAAudioClient>",
-   "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-302",
-   "self_type" : "type-301",
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::IAAudioClient>",
-   "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-392",
-   "self_type" : "type-391",
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::IAAudioClient>",
-   "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-568",
-   "self_type" : "type-567",
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::IAAudioClient>",
-   "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-718",
-   "self_type" : "type-717",
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::IAAudioClient>",
-   "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-850",
-   "self_type" : "type-849",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::IAAudioClient>",
-   "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-934",
-   "self_type" : "type-933",
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::IAAudioClient>",
-   "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-99",
-   "self_type" : "type-98",
+   "linker_set_key" : "const android::sp<android::IAAudioService>",
+   "name" : "const android::sp<android::IAAudioService>",
+   "referenced_type" : "type-1013",
+   "self_type" : "type-1012",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -14103,8 +14168,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioService>",
    "name" : "const android::sp<android::IAAudioService>",
-   "referenced_type" : "type-1064",
-   "self_type" : "type-1063",
+   "referenced_type" : "type-1146",
+   "self_type" : "type-1145",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -14113,8 +14178,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioService>",
    "name" : "const android::sp<android::IAAudioService>",
-   "referenced_type" : "type-1368",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-496",
+   "self_type" : "type-495",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -14123,18 +14188,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioService>",
    "name" : "const android::sp<android::IAAudioService>",
-   "referenced_type" : "type-848",
-   "self_type" : "type-847",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::IAAudioService>",
-   "name" : "const android::sp<android::IAAudioService>",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
+   "referenced_type" : "type-797",
+   "self_type" : "type-796",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -14143,8 +14198,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IBinder>",
    "name" : "const android::sp<android::IBinder>",
-   "referenced_type" : "type-1094",
-   "self_type" : "type-1093",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1042",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -14153,8 +14208,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IBinder>",
    "name" : "const android::sp<android::IBinder>",
-   "referenced_type" : "type-1123",
-   "self_type" : "type-1122",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1071",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -14163,8 +14218,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IBinder>",
    "name" : "const android::sp<android::IBinder>",
-   "referenced_type" : "type-133",
-   "self_type" : "type-132",
+   "referenced_type" : "type-1176",
+   "self_type" : "type-1175",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -14173,8 +14228,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IBinder>",
    "name" : "const android::sp<android::IBinder>",
-   "referenced_type" : "type-1398",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1206",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IBinder>",
+   "name" : "const android::sp<android::IBinder>",
+   "referenced_type" : "type-526",
+   "self_type" : "type-525",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -14183,18 +14248,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IBinder>",
    "name" : "const android::sp<android::IBinder>",
-   "referenced_type" : "type-1427",
-   "self_type" : "type-1426",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::IBinder>",
-   "name" : "const android::sp<android::IBinder>",
-   "referenced_type" : "type-170",
-   "self_type" : "type-169",
+   "referenced_type" : "type-555",
+   "self_type" : "type-554",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -14202,104 +14257,104 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-1074",
-   "self_type" : "type-1073",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1022",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1117",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1066",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-112",
-   "self_type" : "type-111",
+   "referenced_type" : "type-1156",
+   "self_type" : "type-1155",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-1247",
-   "self_type" : "type-1246",
+   "referenced_type" : "type-1201",
+   "self_type" : "type-1200",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1318",
+   "self_type" : "type-1317",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1394",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-163",
-   "self_type" : "type-162",
+   "referenced_type" : "type-189",
+   "self_type" : "type-188",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-312",
-   "self_type" : "type-311",
+   "referenced_type" : "type-374",
+   "self_type" : "type-373",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-399",
-   "self_type" : "type-398",
+   "referenced_type" : "type-506",
+   "self_type" : "type-505",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-577",
-   "self_type" : "type-576",
+   "referenced_type" : "type-550",
+   "self_type" : "type-549",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-727",
-   "self_type" : "type-726",
+   "referenced_type" : "type-676",
+   "self_type" : "type-675",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-858",
-   "self_type" : "type-857",
+   "referenced_type" : "type-807",
+   "self_type" : "type-806",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
-   "referenced_type" : "type-943",
-   "self_type" : "type-942",
+   "referenced_type" : "type-892",
+   "self_type" : "type-891",
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
   {
@@ -14307,8 +14362,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-332",
-   "self_type" : "type-331",
+   "referenced_type" : "type-209",
+   "self_type" : "type-208",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libaaudio/include/aaudio/AAudio.h"
   },
@@ -14318,7 +14373,7 @@
    "linker_set_key" : "const float",
    "name" : "const float",
    "referenced_type" : "type-27",
-   "self_type" : "type-238",
+   "self_type" : "type-94",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/ClipToRange.h"
   },
@@ -14327,8 +14382,8 @@
    "is_const" : true,
    "linker_set_key" : "const flowgraph::AudioFloatBlockPort",
    "name" : "const flowgraph::AudioFloatBlockPort",
-   "referenced_type" : "type-214",
-   "self_type" : "type-225",
+   "referenced_type" : "type-78",
+   "self_type" : "type-81",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/AudioProcessorBase.h"
   },
@@ -14337,8 +14392,8 @@
    "is_const" : true,
    "linker_set_key" : "const flowgraph::AudioPort",
    "name" : "const flowgraph::AudioPort",
-   "referenced_type" : "type-177",
-   "self_type" : "type-202",
+   "referenced_type" : "type-73",
+   "self_type" : "type-76",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/AudioProcessorBase.h"
   },
@@ -14347,8 +14402,8 @@
    "is_const" : true,
    "linker_set_key" : "const flowgraph::ClipToRange",
    "name" : "const flowgraph::ClipToRange",
-   "referenced_type" : "type-239",
-   "self_type" : "type-241",
+   "referenced_type" : "type-95",
+   "self_type" : "type-97",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/ClipToRange.h"
   },
@@ -14357,8 +14412,8 @@
    "is_const" : true,
    "linker_set_key" : "const flowgraph::RampLinear",
    "name" : "const flowgraph::RampLinear",
-   "referenced_type" : "type-244",
-   "self_type" : "type-247",
+   "referenced_type" : "type-100",
+   "self_type" : "type-103",
    "size" : 120,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/RampLinear.h"
   },
@@ -14377,8 +14432,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> >",
    "name" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> >",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1101",
+   "referenced_type" : "type-1051",
+   "self_type" : "type-1050",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -14387,8 +14442,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> >",
    "name" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> >",
-   "referenced_type" : "type-1406",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1183",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -14397,8 +14452,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> >",
    "name" : "const std::unique_ptr<android::IAAudioClient, std::default_delete<android::IAAudioClient> >",
-   "referenced_type" : "type-144",
-   "self_type" : "type-143",
+   "referenced_type" : "type-534",
+   "self_type" : "type-533",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -14407,8 +14462,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> >",
    "name" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> >",
-   "referenced_type" : "type-1131",
-   "self_type" : "type-1130",
+   "referenced_type" : "type-1080",
+   "self_type" : "type-1079",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -14417,8 +14472,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> >",
    "name" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> >",
-   "referenced_type" : "type-1435",
-   "self_type" : "type-1434",
+   "referenced_type" : "type-1215",
+   "self_type" : "type-1214",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -14427,8 +14482,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> >",
    "name" : "const std::unique_ptr<android::IAAudioService, std::default_delete<android::IAAudioService> >",
-   "referenced_type" : "type-182",
-   "self_type" : "type-181",
+   "referenced_type" : "type-563",
+   "self_type" : "type-562",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h"
   },
@@ -14447,7 +14502,7 @@
    "linker_set_key" : "const void",
    "name" : "const void",
    "referenced_type" : "type-54",
-   "self_type" : "type-234",
+   "self_type" : "type-90",
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   }
  ],
@@ -14460,38 +14515,38 @@
     {
      "access" : "private",
      "field_name" : "mSource",
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-106"
     },
     {
      "access" : "private",
      "field_name" : "mVolumeRamp",
      "field_offset" : 64,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-107"
     },
     {
      "access" : "private",
      "field_name" : "mClipper",
      "field_offset" : 128,
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-108"
     },
     {
      "access" : "private",
      "field_name" : "mChannelConverter",
      "field_offset" : 192,
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-109"
     },
     {
      "access" : "private",
      "field_name" : "mSink",
      "field_offset" : 256,
-     "referenced_type" : "type-74"
+     "referenced_type" : "type-110"
     }
    ],
    "linker_set_key" : "AAudioFlowGraph",
    "name" : "AAudioFlowGraph",
    "record_kind" : "class",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 40,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AAudioFlowGraph.h",
    "unique_id" : "_ZTS15AAudioFlowGraph"
@@ -14526,8 +14581,8 @@
    "linker_set_key" : "AudioClock",
    "name" : "AudioClock",
    "record_kind" : "class",
-   "referenced_type" : "type-390",
-   "self_type" : "type-390",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/AudioClock.h",
    "unique_id" : "_ZTS10AudioClock"
@@ -14540,7 +14595,7 @@
      "access" : "protected",
      "field_name" : "mFixedBlockProcessor",
      "field_offset" : 64,
-     "referenced_type" : "type-257"
+     "referenced_type" : "type-120"
     },
     {
      "access" : "protected",
@@ -14564,8 +14619,8 @@
    "linker_set_key" : "FixedBlockAdapter",
    "name" : "FixedBlockAdapter",
    "record_kind" : "class",
-   "referenced_type" : "type-256",
-   "self_type" : "type-256",
+   "referenced_type" : "type-119",
+   "self_type" : "type-119",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/FixedBlockAdapter.h",
    "unique_id" : "_ZTS17FixedBlockAdapter",
@@ -14600,8 +14655,8 @@
    "linker_set_key" : "FixedBlockProcessor",
    "name" : "FixedBlockProcessor",
    "record_kind" : "class",
-   "referenced_type" : "type-254",
-   "self_type" : "type-254",
+   "referenced_type" : "type-117",
+   "self_type" : "type-117",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/FixedBlockAdapter.h",
    "unique_id" : "_ZTS19FixedBlockProcessor",
@@ -14633,14 +14688,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-256"
+     "referenced_type" : "type-119"
     }
    ],
    "linker_set_key" : "FixedBlockReader",
    "name" : "FixedBlockReader",
    "record_kind" : "class",
-   "referenced_type" : "type-278",
-   "self_type" : "type-278",
+   "referenced_type" : "type-141",
+   "self_type" : "type-141",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/FixedBlockReader.h",
    "unique_id" : "_ZTS16FixedBlockReader",
@@ -14674,14 +14729,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-256"
+     "referenced_type" : "type-119"
     }
    ],
    "linker_set_key" : "FixedBlockWriter",
    "name" : "FixedBlockWriter",
    "record_kind" : "class",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-131",
+   "self_type" : "type-131",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/FixedBlockWriter.h",
    "unique_id" : "_ZTS16FixedBlockWriter",
@@ -14730,8 +14785,8 @@
    "linker_set_key" : "MonotonicCounter",
    "name" : "MonotonicCounter",
    "record_kind" : "class",
-   "referenced_type" : "type-223",
-   "self_type" : "type-223",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libaaudio/src/utility/MonotonicCounter.h",
    "unique_id" : "_ZTS16MonotonicCounter",
@@ -14811,13 +14866,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-175"
     },
     {
      "referenced_type" : "type-19"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-176"
     }
    ],
    "fields" :
@@ -14826,26 +14881,26 @@
      "access" : "private",
      "field_name" : "mServiceLock",
      "field_offset" : 64,
-     "referenced_type" : "type-295"
+     "referenced_type" : "type-172"
     },
     {
      "access" : "private",
      "field_name" : "mAAudioService",
      "field_offset" : 384,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-173"
     },
     {
      "access" : "private",
      "field_name" : "mAAudioClient",
      "field_offset" : 448,
-     "referenced_type" : "type-297"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "aaudio::AAudioBinderClient",
    "name" : "aaudio::AAudioBinderClient",
    "record_kind" : "class",
-   "referenced_type" : "type-294",
-   "self_type" : "type-294",
+   "referenced_type" : "type-171",
+   "self_type" : "type-171",
    "size" : 80,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h",
    "unique_id" : "_ZTSN6aaudio18AAudioBinderClientE",
@@ -14957,10 +15012,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-309"
+     "referenced_type" : "type-186"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-164"
     }
    ],
    "fields" :
@@ -14969,14 +15024,14 @@
      "access" : "private",
      "field_name" : "mBinderClient",
      "field_offset" : 320,
-     "referenced_type" : "type-308"
+     "referenced_type" : "type-185"
     }
    ],
    "linker_set_key" : "aaudio::AAudioBinderClient::AAudioClient",
    "name" : "aaudio::AAudioBinderClient::AAudioClient",
    "record_kind" : "class",
-   "referenced_type" : "type-307",
-   "self_type" : "type-307",
+   "referenced_type" : "type-184",
+   "self_type" : "type-184",
    "size" : 72,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h",
    "unique_id" : "_ZTSN6aaudio18AAudioBinderClient12AAudioClientE",
@@ -15159,17 +15214,17 @@
    [
     {
      "field_name" : "event",
-     "referenced_type" : "type-317"
+     "referenced_type" : "type-194"
     },
     {
      "field_offset" : 64,
-     "referenced_type" : "type-319"
+     "referenced_type" : "type-196"
     }
    ],
    "linker_set_key" : "aaudio::AAudioMessageEvent",
    "name" : "aaudio::AAudioMessageEvent",
-   "referenced_type" : "type-318",
-   "self_type" : "type-318",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioServiceMessage.h",
    "unique_id" : "_ZTSN6aaudio18AAudioMessageEventE"
@@ -15180,7 +15235,7 @@
    [
     {
      "field_name" : "dataDouble",
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-197"
     },
     {
      "field_name" : "dataLong",
@@ -15191,8 +15246,8 @@
    "linker_set_key" : "aaudio::AAudioMessageEvent::(anonymous union at frameworks/av/media/libaaudio/src/binding/AAudioServiceMessage.h:46:5) at frameworks/av/media/libaaudio/src/binding/AAudioServiceMessage.h:46:5",
    "name" : "aaudio::AAudioMessageEvent::(anonymous union at frameworks/av/media/libaaudio/src/binding/AAudioServiceMessage.h:46:5) at frameworks/av/media/libaaudio/src/binding/AAudioServiceMessage.h:46:5",
    "record_kind" : "union",
-   "referenced_type" : "type-319",
-   "self_type" : "type-319",
+   "referenced_type" : "type-196",
+   "self_type" : "type-196",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioServiceMessage.h",
    "unique_id" : "_ZTSN6aaudio18AAudioMessageEventUt_E"
@@ -15213,8 +15268,8 @@
    ],
    "linker_set_key" : "aaudio::AAudioMessageTimestamp",
    "name" : "aaudio::AAudioMessageTimestamp",
-   "referenced_type" : "type-316",
-   "self_type" : "type-316",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioServiceMessage.h",
    "unique_id" : "_ZTSN6aaudio22AAudioMessageTimestampE"
@@ -15302,17 +15357,17 @@
    [
     {
      "field_name" : "what",
-     "referenced_type" : "type-322"
+     "referenced_type" : "type-199"
     },
     {
      "field_offset" : 64,
-     "referenced_type" : "type-323"
+     "referenced_type" : "type-200"
     }
    ],
    "linker_set_key" : "aaudio::AAudioServiceMessage_s",
    "name" : "aaudio::AAudioServiceMessage_s",
-   "referenced_type" : "type-321",
-   "self_type" : "type-321",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioServiceMessage.h",
    "unique_id" : "_ZTSN6aaudio22AAudioServiceMessage_sE"
@@ -15323,19 +15378,19 @@
    [
     {
      "field_name" : "timestamp",
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-193"
     },
     {
      "field_name" : "event",
-     "referenced_type" : "type-318"
+     "referenced_type" : "type-195"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "aaudio::AAudioServiceMessage_s::(anonymous union at frameworks/av/media/libaaudio/src/binding/AAudioServiceMessage.h:61:5) at frameworks/av/media/libaaudio/src/binding/AAudioServiceMessage.h:61:5",
    "name" : "aaudio::AAudioServiceMessage_s::(anonymous union at frameworks/av/media/libaaudio/src/binding/AAudioServiceMessage.h:61:5) at frameworks/av/media/libaaudio/src/binding/AAudioServiceMessage.h:61:5",
    "record_kind" : "union",
-   "referenced_type" : "type-323",
-   "self_type" : "type-323",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioServiceMessage.h",
    "unique_id" : "_ZTSN6aaudio22AAudioServiceMessage_sUt_E"
@@ -15348,14 +15403,14 @@
      "referenced_type" : "type-3"
     },
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-150"
     }
    ],
    "linker_set_key" : "aaudio::AAudioStreamConfiguration",
    "name" : "aaudio::AAudioStreamConfiguration",
    "record_kind" : "class",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
+   "referenced_type" : "type-149",
+   "self_type" : "type-149",
    "size" : 64,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamConfiguration.h",
    "unique_id" : "_ZTSN6aaudio25AAudioStreamConfigurationE",
@@ -15521,7 +15576,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-106"
+     "referenced_type" : "type-153"
     }
    ],
    "fields" :
@@ -15530,7 +15585,7 @@
      "access" : "protected",
      "field_name" : "mConfiguration",
      "field_offset" : 64,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-149"
     },
     {
      "access" : "protected",
@@ -15560,8 +15615,8 @@
    "linker_set_key" : "aaudio::AAudioStreamRequest",
    "name" : "aaudio::AAudioStreamRequest",
    "record_kind" : "class",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-152",
+   "self_type" : "type-152",
    "size" : 88,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioStreamRequest.h",
    "unique_id" : "_ZTSN6aaudio19AAudioStreamRequestE",
@@ -16050,7 +16105,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-382"
+     "referenced_type" : "type-261"
     }
    ],
    "fields" :
@@ -16059,7 +16114,7 @@
      "access" : "private",
      "field_name" : "mParent",
      "field_offset" : 1152,
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-116"
     },
     {
      "access" : "private",
@@ -16077,8 +16132,8 @@
    "linker_set_key" : "aaudio::AudioStream::MyPlayerBase",
    "name" : "aaudio::AudioStream::MyPlayerBase",
    "record_kind" : "class",
-   "referenced_type" : "type-381",
-   "self_type" : "type-381",
+   "referenced_type" : "type-260",
+   "self_type" : "type-260",
    "size" : 176,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h",
    "unique_id" : "_ZTSN6aaudio11AudioStream12MyPlayerBaseE",
@@ -16318,8 +16373,8 @@
    "linker_set_key" : "aaudio::AudioStreamBuilder",
    "name" : "aaudio::AudioStreamBuilder",
    "record_kind" : "class",
-   "referenced_type" : "type-370",
-   "self_type" : "type-370",
+   "referenced_type" : "type-247",
+   "self_type" : "type-247",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStreamBuilder.h",
    "unique_id" : "_ZTSN6aaudio18AudioStreamBuilderE",
@@ -16364,109 +16419,109 @@
     {
      "access" : "protected",
      "field_name" : "mAudioEndpoint",
-     "field_offset" : 1984,
+     "field_offset" : 2048,
      "referenced_type" : "type-10"
     },
     {
      "access" : "protected",
      "field_name" : "mServiceStreamHandle",
-     "field_offset" : 2368,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mFramesPerBurst",
-     "field_offset" : 2400,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mXRunCount",
      "field_offset" : 2432,
      "referenced_type" : "type-4"
     },
     {
      "access" : "protected",
-     "field_name" : "mFramesOffsetFromService",
+     "field_name" : "mFramesPerBurst",
+     "field_offset" : 2464,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mXRunCount",
      "field_offset" : 2496,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mFramesOffsetFromService",
+     "field_offset" : 2560,
      "referenced_type" : "type-8"
     },
     {
      "access" : "protected",
      "field_name" : "mCallbackBuffer",
-     "field_offset" : 2560,
+     "field_offset" : 2624,
      "referenced_type" : "type-14"
     },
     {
      "access" : "protected",
      "field_name" : "mCallbackFrames",
-     "field_offset" : 2624,
+     "field_offset" : 2688,
      "referenced_type" : "type-4"
     },
     {
      "access" : "protected",
      "field_name" : "mInService",
-     "field_offset" : 2656,
+     "field_offset" : 2720,
      "referenced_type" : "type-16"
     },
     {
      "access" : "protected",
      "field_name" : "mServiceInterface",
-     "field_offset" : 2688,
+     "field_offset" : 2752,
      "referenced_type" : "type-18"
     },
     {
      "access" : "protected",
      "field_name" : "mAtomicInternalTimestamp",
-     "field_offset" : 2752,
+     "field_offset" : 2816,
      "referenced_type" : "type-20"
     },
     {
      "access" : "protected",
      "field_name" : "mNeedCatchUp",
-     "field_offset" : 3072,
+     "field_offset" : 3136,
      "referenced_type" : "type-24"
     },
     {
      "access" : "protected",
      "field_name" : "mStreamVolume",
-     "field_offset" : 3136,
+     "field_offset" : 3200,
      "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mWakeupDelayNanos",
-     "field_offset" : 3168,
+     "field_offset" : 3232,
      "referenced_type" : "type-13"
     },
     {
      "access" : "private",
      "field_name" : "mMinimumSleepNanos",
-     "field_offset" : 3200,
+     "field_offset" : 3264,
      "referenced_type" : "type-13"
     },
     {
      "access" : "private",
      "field_name" : "mEndPointParcelable",
-     "field_offset" : 3264,
+     "field_offset" : 3328,
      "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mEndpointDescriptor",
-     "field_offset" : 12608,
+     "field_offset" : 12672,
      "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mServiceLatencyNanos",
-     "field_offset" : 13568,
+     "field_offset" : 13632,
      "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mDeviceChannelCount",
-     "field_offset" : 13632,
+     "field_offset" : 13696,
      "referenced_type" : "type-4"
     }
    ],
@@ -16475,7 +16530,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-6",
    "self_type" : "type-6",
-   "size" : 1712,
+   "size" : 1720,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h",
    "unique_id" : "_ZTSN6aaudio19AudioStreamInternalE",
    "vtable_components" :
@@ -16612,16 +16667,16 @@
     {
      "access" : "private",
      "field_name" : "mLastFramesWritten",
-     "field_offset" : 13696,
+     "field_offset" : 13760,
      "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "aaudio::AudioStreamInternalCapture",
    "name" : "aaudio::AudioStreamInternalCapture",
    "record_kind" : "class",
-   "referenced_type" : "type-139",
-   "self_type" : "type-139",
-   "size" : 1720,
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
+   "size" : 1728,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalCapture.h",
    "unique_id" : "_ZTSN6aaudio26AudioStreamInternalCaptureE",
    "vtable_components" :
@@ -16752,22 +16807,22 @@
     {
      "access" : "private",
      "field_name" : "mLastFramesRead",
-     "field_offset" : 13696,
+     "field_offset" : 13760,
      "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mFlowGraph",
-     "field_offset" : 13760,
-     "referenced_type" : "type-69"
+     "field_offset" : 13824,
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "aaudio::AudioStreamInternalPlay",
    "name" : "aaudio::AudioStreamInternalPlay",
    "record_kind" : "class",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
-   "size" : 1760,
+   "referenced_type" : "type-111",
+   "self_type" : "type-111",
+   "size" : 1768,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h",
    "unique_id" : "_ZTSN6aaudio23AudioStreamInternalPlayE",
    "vtable_components" :
@@ -16893,7 +16948,7 @@
      "referenced_type" : "type-42"
     },
     {
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-117"
     }
    ],
    "fields" :
@@ -16902,25 +16957,25 @@
      "access" : "protected",
      "field_name" : "mFramesWritten",
      "field_offset" : 1728,
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-80"
     },
     {
      "access" : "protected",
      "field_name" : "mFramesRead",
      "field_offset" : 1920,
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-80"
     },
     {
      "access" : "protected",
      "field_name" : "mTimestampPosition",
      "field_offset" : 2112,
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-80"
     },
     {
      "access" : "protected",
      "field_name" : "mBlockAdapter",
      "field_offset" : 2304,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-122"
     },
     {
      "access" : "protected",
@@ -16938,7 +16993,7 @@
      "access" : "protected",
      "field_name" : "mDeviceCallback",
      "field_offset" : 2432,
-     "referenced_type" : "type-261"
+     "referenced_type" : "type-124"
     },
     {
      "access" : "protected",
@@ -16950,8 +17005,8 @@
    "linker_set_key" : "aaudio::AudioStreamLegacy",
    "name" : "aaudio::AudioStreamLegacy",
    "record_kind" : "class",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
+   "referenced_type" : "type-123",
+   "self_type" : "type-123",
    "size" : 320,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h",
    "unique_id" : "_ZTSN6aaudio17AudioStreamLegacyE",
@@ -17100,7 +17155,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-265"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -17108,14 +17163,14 @@
     {
      "field_name" : "mParent",
      "field_offset" : 128,
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "aaudio::AudioStreamLegacy::StreamDeviceCallback",
    "name" : "aaudio::AudioStreamLegacy::StreamDeviceCallback",
    "record_kind" : "class",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
+   "referenced_type" : "type-127",
+   "self_type" : "type-127",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamLegacy.h",
    "unique_id" : "_ZTSN6aaudio17AudioStreamLegacy20StreamDeviceCallbackE",
@@ -17158,7 +17213,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-123"
     }
    ],
    "fields" :
@@ -17167,31 +17222,31 @@
      "access" : "private",
      "field_name" : "mAudioRecord",
      "field_offset" : 2560,
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-134"
     },
     {
      "access" : "private",
      "field_name" : "mFixedBlockWriter",
      "field_offset" : 2624,
-     "referenced_type" : "type-268"
+     "referenced_type" : "type-131"
     },
     {
      "access" : "private",
      "field_name" : "mOpPackageName",
      "field_offset" : 2880,
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-135"
     },
     {
      "access" : "private",
      "field_name" : "mFormatConversionBufferFloat",
      "field_offset" : 2944,
-     "referenced_type" : "type-273"
+     "referenced_type" : "type-136"
     },
     {
      "access" : "private",
      "field_name" : "mFormatConversionBufferI16",
      "field_offset" : 3008,
-     "referenced_type" : "type-274"
+     "referenced_type" : "type-137"
     },
     {
      "access" : "private",
@@ -17203,8 +17258,8 @@
    "linker_set_key" : "aaudio::AudioStreamRecord",
    "name" : "aaudio::AudioStreamRecord",
    "record_kind" : "class",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-133",
+   "self_type" : "type-133",
    "size" : 392,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamRecord.h",
    "unique_id" : "_ZTSN6aaudio17AudioStreamRecordE",
@@ -17344,7 +17399,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-123"
     }
    ],
    "fields" :
@@ -17353,13 +17408,13 @@
      "access" : "private",
      "field_name" : "mAudioTrack",
      "field_offset" : 2560,
-     "referenced_type" : "type-281"
+     "referenced_type" : "type-144"
     },
     {
      "access" : "private",
      "field_name" : "mFixedBlockReader",
      "field_offset" : 2624,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-141"
     },
     {
      "access" : "private",
@@ -17371,8 +17426,8 @@
    "linker_set_key" : "aaudio::AudioStreamTrack",
    "name" : "aaudio::AudioStreamTrack",
    "record_kind" : "class",
-   "referenced_type" : "type-280",
-   "self_type" : "type-280",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 368,
    "source_file" : "/frameworks/av/media/libaaudio/src/legacy/AudioStreamTrack.h",
    "unique_id" : "_ZTSN6aaudio16AudioStreamTrackE",
@@ -17564,15 +17619,27 @@
     },
     {
      "access" : "private",
-     "field_name" : "mMaxLatenessInNanos",
+     "field_name" : "mBurstPeriodNanos",
      "field_offset" : 256,
      "referenced_type" : "type-4"
     },
     {
      "access" : "private",
-     "field_name" : "mState",
+     "field_name" : "mMaxMeasuredLatenessNanos",
      "field_offset" : 288,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mState",
+     "field_offset" : 320,
      "referenced_type" : "type-9"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampCount",
+     "field_offset" : 352,
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "aaudio::IsochronousClockModel",
@@ -17580,7 +17647,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-7",
    "self_type" : "type-7",
-   "size" : 40,
+   "size" : 48,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h",
    "unique_id" : "_ZTSN6aaudio21IsochronousClockModelE",
    "vtable_components" :
@@ -17864,14 +17931,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-165"
     }
    ],
    "linker_set_key" : "android::BnAAudioClient",
    "name" : "android::BnAAudioClient",
    "record_kind" : "class",
-   "referenced_type" : "type-146",
-   "self_type" : "type-146",
+   "referenced_type" : "type-164",
+   "self_type" : "type-164",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h",
    "unique_id" : "_ZTSN7android14BnAAudioClientE",
@@ -18028,14 +18095,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-185"
+     "referenced_type" : "type-170"
     }
    ],
    "linker_set_key" : "android::BnAAudioService",
    "name" : "android::BnAAudioService",
    "record_kind" : "class",
-   "referenced_type" : "type-184",
-   "self_type" : "type-184",
+   "referenced_type" : "type-169",
+   "self_type" : "type-169",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h",
    "unique_id" : "_ZTSN7android15BnAAudioServiceE",
@@ -18265,7 +18332,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-324"
+     "referenced_type" : "type-201"
     }
    ],
    "fields" :
@@ -18274,20 +18341,20 @@
      "access" : "private",
      "field_name" : "mReadCounter",
      "field_offset" : 128,
-     "referenced_type" : "type-442"
+     "referenced_type" : "type-256"
     },
     {
      "access" : "private",
      "field_name" : "mWriteCounter",
      "field_offset" : 192,
-     "referenced_type" : "type-443"
+     "referenced_type" : "type-257"
     }
    ],
    "linker_set_key" : "android::FifoController",
    "name" : "android::FifoController",
    "record_kind" : "class",
-   "referenced_type" : "type-441",
-   "self_type" : "type-441",
+   "referenced_type" : "type-255",
+   "self_type" : "type-255",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libaaudio/src/fifo/FifoController.h",
    "unique_id" : "_ZTSN7android14FifoControllerE",
@@ -18342,8 +18409,8 @@
    "linker_set_key" : "android::FifoControllerBase",
    "name" : "android::FifoControllerBase",
    "record_kind" : "class",
-   "referenced_type" : "type-324",
-   "self_type" : "type-324",
+   "referenced_type" : "type-201",
+   "self_type" : "type-201",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libaaudio/src/fifo/FifoControllerBase.h",
    "unique_id" : "_ZTSN7android18FifoControllerBaseE",
@@ -18387,7 +18454,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-324"
+     "referenced_type" : "type-201"
     }
    ],
    "fields" :
@@ -18396,20 +18463,20 @@
      "access" : "private",
      "field_name" : "mReadCounterAddress",
      "field_offset" : 128,
-     "referenced_type" : "type-437"
+     "referenced_type" : "type-250"
     },
     {
      "access" : "private",
      "field_name" : "mWriteCounterAddress",
      "field_offset" : 192,
-     "referenced_type" : "type-437"
+     "referenced_type" : "type-250"
     }
    ],
    "linker_set_key" : "android::FifoControllerIndirect",
    "name" : "android::FifoControllerIndirect",
    "record_kind" : "class",
-   "referenced_type" : "type-436",
-   "self_type" : "type-436",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libaaudio/src/fifo/FifoControllerIndirect.h",
    "unique_id" : "_ZTSN7android22FifoControllerIndirectE",
@@ -18449,14 +18516,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-161"
     }
    ],
    "linker_set_key" : "android::IAAudioClient",
    "name" : "android::IAAudioClient",
    "record_kind" : "class",
-   "referenced_type" : "type-137",
-   "self_type" : "type-137",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h",
    "unique_id" : "_ZTSN7android13IAAudioClientE",
@@ -18543,14 +18610,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-175"
+     "referenced_type" : "type-168"
     }
    ],
    "linker_set_key" : "android::IAAudioService",
    "name" : "android::IAAudioService",
    "record_kind" : "class",
-   "referenced_type" : "type-174",
-   "self_type" : "type-174",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioService.h",
    "unique_id" : "_ZTSN7android14IAAudioServiceE",
@@ -18674,18 +18741,18 @@
    [
     {
      "field_name" : "data",
-     "referenced_type" : "type-328"
+     "referenced_type" : "type-205"
     },
     {
      "field_name" : "numFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-329"
+     "referenced_type" : "type-206"
     }
    ],
    "linker_set_key" : "android::WrappingBuffer",
    "name" : "android::WrappingBuffer",
-   "referenced_type" : "type-327",
-   "self_type" : "type-327",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libaaudio/src/fifo/FifoBuffer.h",
    "unique_id" : "_ZTSN7android14WrappingBufferE"
@@ -18695,7 +18762,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-177"
+     "referenced_type" : "type-73"
     }
    ],
    "fields" :
@@ -18710,14 +18777,14 @@
      "access" : "private",
      "field_name" : "mSampleBlock",
      "field_offset" : 192,
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-79"
     }
    ],
    "linker_set_key" : "flowgraph::AudioFloatBlockPort",
    "name" : "flowgraph::AudioFloatBlockPort",
    "record_kind" : "class",
-   "referenced_type" : "type-214",
-   "self_type" : "type-214",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/AudioProcessorBase.h",
    "unique_id" : "_ZTSN9flowgraph19AudioFloatBlockPortE",
@@ -18748,7 +18815,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-214"
+     "referenced_type" : "type-78"
     }
    ],
    "fields" :
@@ -18757,14 +18824,14 @@
      "access" : "private",
      "field_name" : "mConnected",
      "field_offset" : 256,
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-85"
     }
    ],
    "linker_set_key" : "flowgraph::AudioFloatInputPort",
    "name" : "flowgraph::AudioFloatInputPort",
    "record_kind" : "class",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
+   "referenced_type" : "type-86",
+   "self_type" : "type-86",
    "size" : 40,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/AudioProcessorBase.h",
    "unique_id" : "_ZTSN9flowgraph19AudioFloatInputPortE",
@@ -18795,14 +18862,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-214"
+     "referenced_type" : "type-78"
     }
    ],
    "linker_set_key" : "flowgraph::AudioFloatOutputPort",
    "name" : "flowgraph::AudioFloatOutputPort",
    "record_kind" : "class",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/AudioProcessorBase.h",
    "unique_id" : "_ZTSN9flowgraph20AudioFloatOutputPortE",
@@ -18835,7 +18902,7 @@
     {
      "access" : "protected",
      "field_name" : "mParent",
-     "referenced_type" : "type-178"
+     "referenced_type" : "type-74"
     },
     {
      "access" : "private",
@@ -18847,8 +18914,8 @@
    "linker_set_key" : "flowgraph::AudioPort",
    "name" : "flowgraph::AudioPort",
    "record_kind" : "class",
-   "referenced_type" : "type-177",
-   "self_type" : "type-177",
+   "referenced_type" : "type-73",
+   "self_type" : "type-73",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/AudioProcessorBase.h",
    "unique_id" : "_ZTSN9flowgraph9AudioPortE"
@@ -18873,8 +18940,8 @@
    "linker_set_key" : "flowgraph::AudioProcessorBase",
    "name" : "flowgraph::AudioProcessorBase",
    "record_kind" : "class",
-   "referenced_type" : "type-165",
-   "self_type" : "type-165",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/AudioProcessorBase.h",
    "unique_id" : "_ZTSN9flowgraph18AudioProcessorBaseE",
@@ -18906,7 +18973,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-165"
+     "referenced_type" : "type-71"
     }
    ],
    "fields" :
@@ -18914,7 +18981,7 @@
     {
      "field_name" : "input",
      "field_offset" : 192,
-     "referenced_type" : "type-230"
+     "referenced_type" : "type-86"
     },
     {
      "access" : "private",
@@ -18926,8 +18993,8 @@
    "linker_set_key" : "flowgraph::AudioSink",
    "name" : "flowgraph::AudioSink",
    "record_kind" : "class",
-   "referenced_type" : "type-236",
-   "self_type" : "type-236",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
    "size" : 72,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/AudioProcessorBase.h",
    "unique_id" : "_ZTSN9flowgraph9AudioSinkE",
@@ -18962,7 +19029,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-165"
+     "referenced_type" : "type-71"
     }
    ],
    "fields" :
@@ -18970,13 +19037,13 @@
     {
      "field_name" : "output",
      "field_offset" : 192,
-     "referenced_type" : "type-228"
+     "referenced_type" : "type-84"
     },
     {
      "access" : "protected",
      "field_name" : "mData",
      "field_offset" : 448,
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-89"
     },
     {
      "access" : "protected",
@@ -18994,8 +19061,8 @@
    "linker_set_key" : "flowgraph::AudioSource",
    "name" : "flowgraph::AudioSource",
    "record_kind" : "class",
-   "referenced_type" : "type-232",
-   "self_type" : "type-232",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
    "size" : 72,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/AudioProcessorBase.h",
    "unique_id" : "_ZTSN9flowgraph11AudioSourceE",
@@ -19027,7 +19094,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-165"
+     "referenced_type" : "type-71"
     }
    ],
    "fields" :
@@ -19035,12 +19102,12 @@
     {
      "field_name" : "input",
      "field_offset" : 192,
-     "referenced_type" : "type-230"
+     "referenced_type" : "type-86"
     },
     {
      "field_name" : "output",
      "field_offset" : 512,
-     "referenced_type" : "type-228"
+     "referenced_type" : "type-84"
     },
     {
      "access" : "private",
@@ -19058,8 +19125,8 @@
    "linker_set_key" : "flowgraph::ClipToRange",
    "name" : "flowgraph::ClipToRange",
    "record_kind" : "class",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-95",
+   "self_type" : "type-95",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/ClipToRange.h",
    "unique_id" : "_ZTSN9flowgraph11ClipToRangeE",
@@ -19090,7 +19157,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-165"
+     "referenced_type" : "type-71"
     }
    ],
    "fields" :
@@ -19098,19 +19165,19 @@
     {
      "field_name" : "input",
      "field_offset" : 192,
-     "referenced_type" : "type-230"
+     "referenced_type" : "type-86"
     },
     {
      "field_name" : "output",
      "field_offset" : 512,
-     "referenced_type" : "type-228"
+     "referenced_type" : "type-84"
     }
    ],
    "linker_set_key" : "flowgraph::MonoToMultiConverter",
    "name" : "flowgraph::MonoToMultiConverter",
    "record_kind" : "class",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
+   "referenced_type" : "type-99",
+   "self_type" : "type-99",
    "size" : 96,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/MonoToMultiConverter.h",
    "unique_id" : "_ZTSN9flowgraph20MonoToMultiConverterE",
@@ -19141,7 +19208,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-165"
+     "referenced_type" : "type-71"
     }
    ],
    "fields" :
@@ -19149,18 +19216,18 @@
     {
      "field_name" : "input",
      "field_offset" : 192,
-     "referenced_type" : "type-230"
+     "referenced_type" : "type-86"
     },
     {
      "field_name" : "output",
      "field_offset" : 512,
-     "referenced_type" : "type-228"
+     "referenced_type" : "type-84"
     },
     {
      "access" : "private",
      "field_name" : "mTarget",
      "field_offset" : 768,
-     "referenced_type" : "type-245"
+     "referenced_type" : "type-101"
     },
     {
      "access" : "private",
@@ -19196,8 +19263,8 @@
    "linker_set_key" : "flowgraph::RampLinear",
    "name" : "flowgraph::RampLinear",
    "record_kind" : "class",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
+   "referenced_type" : "type-100",
+   "self_type" : "type-100",
    "size" : 120,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/RampLinear.h",
    "unique_id" : "_ZTSN9flowgraph10RampLinearE",
@@ -19228,14 +19295,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-92"
     }
    ],
    "linker_set_key" : "flowgraph::SinkFloat",
    "name" : "flowgraph::SinkFloat",
    "record_kind" : "class",
-   "referenced_type" : "type-449",
-   "self_type" : "type-449",
+   "referenced_type" : "type-263",
+   "self_type" : "type-263",
    "size" : 72,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/SinkFloat.h",
    "unique_id" : "_ZTSN9flowgraph9SinkFloatE",
@@ -19269,14 +19336,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-92"
     }
    ],
    "linker_set_key" : "flowgraph::SinkI16",
    "name" : "flowgraph::SinkI16",
    "record_kind" : "class",
-   "referenced_type" : "type-450",
-   "self_type" : "type-450",
+   "referenced_type" : "type-264",
+   "self_type" : "type-264",
    "size" : 72,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/SinkI16.h",
    "unique_id" : "_ZTSN9flowgraph7SinkI16E",
@@ -19310,14 +19377,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-92"
     }
    ],
    "linker_set_key" : "flowgraph::SinkI24",
    "name" : "flowgraph::SinkI24",
    "record_kind" : "class",
-   "referenced_type" : "type-451",
-   "self_type" : "type-451",
+   "referenced_type" : "type-265",
+   "self_type" : "type-265",
    "size" : 72,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/SinkI24.h",
    "unique_id" : "_ZTSN9flowgraph7SinkI24E",
@@ -19351,14 +19418,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-232"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "flowgraph::SourceFloat",
    "name" : "flowgraph::SourceFloat",
    "record_kind" : "class",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
+   "referenced_type" : "type-266",
+   "self_type" : "type-266",
    "size" : 72,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/SourceFloat.h",
    "unique_id" : "_ZTSN9flowgraph11SourceFloatE",
@@ -19389,14 +19456,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-232"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "flowgraph::SourceI16",
    "name" : "flowgraph::SourceI16",
    "record_kind" : "class",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
+   "referenced_type" : "type-267",
+   "self_type" : "type-267",
    "size" : 72,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/SourceI16.h",
    "unique_id" : "_ZTSN9flowgraph9SourceI16E",
@@ -19427,14 +19494,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-232"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "flowgraph::SourceI24",
    "name" : "flowgraph::SourceI24",
    "record_kind" : "class",
-   "referenced_type" : "type-454",
-   "self_type" : "type-454",
+   "referenced_type" : "type-268",
+   "self_type" : "type-268",
    "size" : 72,
    "source_file" : "/frameworks/av/media/libaaudio/src/flowgraph/SourceI24.h",
    "unique_id" : "_ZTSN9flowgraph9SourceI24E",
diff --git a/29/64/x86_x86_64/source-based/libaaudio.so.lsdump b/29/64/x86_x86_64/source-based/libaaudio.so.lsdump
index 4feae1c..7d6f855 100644
--- a/29/64/x86_x86_64/source-based/libaaudio.so.lsdump
+++ b/29/64/x86_x86_64/source-based/libaaudio.so.lsdump
@@ -1544,12 +1544,21 @@
    "name" : "_ZNK6aaudio21IsochronousClockModel21convertTimeToPositionEx"
   },
   {
+   "name" : "_ZNK6aaudio21IsochronousClockModel22getLateTimeOffsetNanosEv"
+  },
+  {
    "name" : "_ZNK6aaudio21IsochronousClockModel26convertDeltaPositionToTimeEx"
   },
   {
    "name" : "_ZNK6aaudio21IsochronousClockModel26convertDeltaTimeToPositionEx"
   },
   {
+   "name" : "_ZNK6aaudio21IsochronousClockModel27convertLatestTimeToPositionEx"
+  },
+  {
+   "name" : "_ZNK6aaudio21IsochronousClockModel27convertPositionToLatestTimeEx"
+  },
+  {
    "name" : "_ZNK6aaudio21IsochronousClockModel4dumpEv"
   },
   {
@@ -9061,6 +9070,20 @@
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
   },
   {
+   "access" : "private",
+   "function_name" : "aaudio::IsochronousClockModel::getLateTimeOffsetNanos",
+   "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel22getLateTimeOffsetNanosEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-193"
+    }
+   ],
+   "return_type" : "type-4",
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
+  },
+  {
    "function_name" : "aaudio::IsochronousClockModel::convertDeltaPositionToTime",
    "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel26convertDeltaPositionToTimeEx",
    "parameters" :
@@ -9093,6 +9116,38 @@
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
   },
   {
+   "function_name" : "aaudio::IsochronousClockModel::convertLatestTimeToPosition",
+   "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel27convertLatestTimeToPositionEx",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-193"
+    },
+    {
+     "referenced_type" : "type-8"
+    }
+   ],
+   "return_type" : "type-8",
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
+  },
+  {
+   "function_name" : "aaudio::IsochronousClockModel::convertPositionToLatestTime",
+   "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel27convertPositionToLatestTimeEx",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-193"
+    },
+    {
+     "referenced_type" : "type-8"
+    }
+   ],
+   "return_type" : "type-8",
+   "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
+  },
+  {
    "function_name" : "aaudio::IsochronousClockModel::dump",
    "linker_set_key" : "_ZNK6aaudio21IsochronousClockModel4dumpEv",
    "parameters" :
@@ -9704,7 +9759,7 @@
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
    "referenced_type" : "type-1187",
-   "self_type" : "type-1189",
+   "self_type" : "type-1190",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -9758,7 +9813,7 @@
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
    "referenced_type" : "type-1173",
-   "self_type" : "type-1178",
+   "self_type" : "type-1179",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/IAAudioClient.h"
   },
@@ -9865,7 +9920,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-1059",
+   "referenced_type" : "type-1061",
    "self_type" : "type-1063",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
@@ -9955,7 +10010,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IAAudioClient> &",
    "name" : "const android::sp<android::IAAudioClient> &",
-   "referenced_type" : "type-754",
+   "referenced_type" : "type-756",
    "self_type" : "type-758",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
@@ -10327,8 +10382,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-1062",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-1060",
+   "self_type" : "type-1059",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -10678,8 +10733,8 @@
    "alignment" : 4,
    "linker_set_key" : "AAudioStreamStruct *",
    "name" : "AAudioStreamStruct *",
-   "referenced_type" : "type-757",
-   "self_type" : "type-756",
+   "referenced_type" : "type-755",
+   "self_type" : "type-754",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/core/AudioStream.h"
   },
@@ -12328,7 +12383,7 @@
    "name" : "const aaudio::AudioStreamInternal",
    "referenced_type" : "type-6",
    "self_type" : "type-65",
-   "size" : 1184,
+   "size" : 1192,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h"
   },
   {
@@ -12338,7 +12393,7 @@
    "name" : "const aaudio::AudioStreamInternalCapture",
    "referenced_type" : "type-69",
    "self_type" : "type-70",
-   "size" : 1192,
+   "size" : 1200,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalCapture.h"
   },
   {
@@ -12348,7 +12403,7 @@
    "name" : "const aaudio::AudioStreamInternalPlay",
    "referenced_type" : "type-113",
    "self_type" : "type-114",
-   "size" : 1216,
+   "size" : 1224,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h"
   },
   {
@@ -12388,7 +12443,7 @@
    "name" : "const aaudio::IsochronousClockModel",
    "referenced_type" : "type-7",
    "self_type" : "type-192",
-   "size" : 36,
+   "size" : 44,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h"
   },
   {
@@ -14016,8 +14071,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioClient>",
    "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-1060",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-1062",
+   "self_type" : "type-1061",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -14106,8 +14161,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioClient>",
    "name" : "const android::sp<android::IAAudioClient>",
-   "referenced_type" : "type-755",
-   "self_type" : "type-754",
+   "referenced_type" : "type-757",
+   "self_type" : "type-756",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -14134,8 +14189,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IAAudioService>",
    "name" : "const android::sp<android::IAAudioService>",
-   "referenced_type" : "type-1146",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-1147",
+   "self_type" : "type-1146",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libaaudio/src/binding/AAudioBinderClient.h"
   },
@@ -16385,109 +16440,109 @@
     {
      "access" : "protected",
      "field_name" : "mAudioEndpoint",
-     "field_offset" : 1376,
+     "field_offset" : 1440,
      "referenced_type" : "type-10"
     },
     {
      "access" : "protected",
      "field_name" : "mServiceStreamHandle",
-     "field_offset" : 1632,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mFramesPerBurst",
-     "field_offset" : 1664,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mXRunCount",
      "field_offset" : 1696,
      "referenced_type" : "type-4"
     },
     {
      "access" : "protected",
-     "field_name" : "mFramesOffsetFromService",
+     "field_name" : "mFramesPerBurst",
      "field_offset" : 1728,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mXRunCount",
+     "field_offset" : 1760,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mFramesOffsetFromService",
+     "field_offset" : 1792,
      "referenced_type" : "type-8"
     },
     {
      "access" : "protected",
      "field_name" : "mCallbackBuffer",
-     "field_offset" : 1792,
+     "field_offset" : 1856,
      "referenced_type" : "type-14"
     },
     {
      "access" : "protected",
      "field_name" : "mCallbackFrames",
-     "field_offset" : 1824,
+     "field_offset" : 1888,
      "referenced_type" : "type-4"
     },
     {
      "access" : "protected",
      "field_name" : "mInService",
-     "field_offset" : 1856,
+     "field_offset" : 1920,
      "referenced_type" : "type-16"
     },
     {
      "access" : "protected",
      "field_name" : "mServiceInterface",
-     "field_offset" : 1888,
+     "field_offset" : 1952,
      "referenced_type" : "type-18"
     },
     {
      "access" : "protected",
      "field_name" : "mAtomicInternalTimestamp",
-     "field_offset" : 1920,
+     "field_offset" : 1984,
      "referenced_type" : "type-20"
     },
     {
      "access" : "protected",
      "field_name" : "mNeedCatchUp",
-     "field_offset" : 2208,
+     "field_offset" : 2272,
      "referenced_type" : "type-24"
     },
     {
      "access" : "protected",
      "field_name" : "mStreamVolume",
-     "field_offset" : 2272,
+     "field_offset" : 2336,
      "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mWakeupDelayNanos",
-     "field_offset" : 2304,
+     "field_offset" : 2368,
      "referenced_type" : "type-13"
     },
     {
      "access" : "private",
      "field_name" : "mMinimumSleepNanos",
-     "field_offset" : 2336,
+     "field_offset" : 2400,
      "referenced_type" : "type-13"
     },
     {
      "access" : "private",
      "field_name" : "mEndPointParcelable",
-     "field_offset" : 2368,
+     "field_offset" : 2432,
      "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mEndpointDescriptor",
-     "field_offset" : 8704,
+     "field_offset" : 8768,
      "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mServiceLatencyNanos",
-     "field_offset" : 9376,
+     "field_offset" : 9440,
      "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mDeviceChannelCount",
-     "field_offset" : 9440,
+     "field_offset" : 9504,
      "referenced_type" : "type-4"
     }
    ],
@@ -16496,7 +16551,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-6",
    "self_type" : "type-6",
-   "size" : 1184,
+   "size" : 1192,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternal.h",
    "unique_id" : "_ZTSN6aaudio19AudioStreamInternalE",
    "vtable_components" :
@@ -16633,7 +16688,7 @@
     {
      "access" : "private",
      "field_name" : "mLastFramesWritten",
-     "field_offset" : 9472,
+     "field_offset" : 9536,
      "referenced_type" : "type-8"
     }
    ],
@@ -16642,7 +16697,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-69",
    "self_type" : "type-69",
-   "size" : 1192,
+   "size" : 1200,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalCapture.h",
    "unique_id" : "_ZTSN6aaudio26AudioStreamInternalCaptureE",
    "vtable_components" :
@@ -16773,13 +16828,13 @@
     {
      "access" : "private",
      "field_name" : "mLastFramesRead",
-     "field_offset" : 9472,
+     "field_offset" : 9536,
      "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mFlowGraph",
-     "field_offset" : 9536,
+     "field_offset" : 9600,
      "referenced_type" : "type-106"
     }
    ],
@@ -16788,7 +16843,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-113",
    "self_type" : "type-113",
-   "size" : 1216,
+   "size" : 1224,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/AudioStreamInternalPlay.h",
    "unique_id" : "_ZTSN6aaudio23AudioStreamInternalPlayE",
    "vtable_components" :
@@ -17585,15 +17640,27 @@
     },
     {
      "access" : "private",
-     "field_name" : "mMaxLatenessInNanos",
+     "field_name" : "mBurstPeriodNanos",
      "field_offset" : 224,
      "referenced_type" : "type-4"
     },
     {
      "access" : "private",
-     "field_name" : "mState",
+     "field_name" : "mMaxMeasuredLatenessNanos",
      "field_offset" : 256,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mState",
+     "field_offset" : 288,
      "referenced_type" : "type-9"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mTimestampCount",
+     "field_offset" : 320,
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "aaudio::IsochronousClockModel",
@@ -17601,7 +17668,7 @@
    "record_kind" : "class",
    "referenced_type" : "type-7",
    "self_type" : "type-7",
-   "size" : 36,
+   "size" : 44,
    "source_file" : "/frameworks/av/media/libaaudio/src/client/IsochronousClockModel.h",
    "unique_id" : "_ZTSN6aaudio21IsochronousClockModelE",
    "vtable_components" :